[PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services

linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services
@ 2025-07-23 22:27 srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts srinivas.kandagatla
                   ` (23 more replies)
  0 siblings, 24 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

All the SoC level dts has exactly same device tree entires for DSP Audio
sevices (apr, gpr, afe, apm, asm, adm) and its child devices.

It does not make sense to keep copying the same content over and over
for each SoC, This patch series moves DSP services to common dtsi file
so that it eliminates duplicate content,  makes audio dts much consistent
and makes it easy for adding audio support for new SoC.
As part of this cleanup, two common dtsi files (elite and audioreach)
based on q6dsp framework are added and a SoC level audio.dtsi needs to add
the required iommu configuration for the audio stream service.
 
This patch series also addresses another issue found with multiple
instances of wsa codec macro, his can lead duplicate dapm widgets
and mixers resulting in failing to probe sound-card if both of
these instances are part of the dai-link.

Tested this on X13s, any testing is appreciated.
   
Srinivas Kandagatla (23):
  arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts
  arm64: dts: qcom: sc8280xp: use dedicated audioreach dtsi
  arm64: dts: qcom: sm8650: use dedicated audioreach dtsi
  arm64: dts: qcom: sm8550: use dedicated audioreach dtsi
  arm64: dts: qcom: sm8450: use dedicated audioreach dtsi
  arm64: dts: qcom: sar2130p: use dedicated audioreach dtsi
  arm64: dts: qcom: sm8350: move dsp audio nodes to dedicated dts
  arm64: dts: qcom: sm8250: use dedicated elite dtsi
  arm64: dts: qcom: sm6115: use dedicated elite dtsi
  arm64: dts: qcom: sdm845: use dedicated elite-audio dtsi
  arm64: dts: qcom: sdm630: use dedicated elite-audio dtsi
  arm64: dts: qcom: sc7280: use dedicated elite-audio dtsi
  arm64: dts: qcom: sc7180: use dedicated elite-audio dtsi
  arm64: dts: qcom: sm8750: use dedicated audioreach dtsi
  arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi
  arm64: dts: qcom: msm8939: use dedicated elite-audio dtsi
  arm64: dts: qcom: msm8996: use dedicated elite-audio dtsi
  arm64: dts: qcom: sm6350: use dedicated elite-audio dtsi
  arm64: dts: qcom: msm8953: use dedicated elite-audio dtsi
  arm64: dts: qcom: sm8450: add sound prefix for wsa2
  arm64: dts: qcom: sm8550: add sound prefix for wsa2
  arm64: dts: qcom: sm8750: add sound prefix for wsa2
  arm64: dts: qcom: sm8650: add sound prefix for wsa2

 arch/arm64/boot/dts/qcom/apq8039-t2.dts       |  1 +
 arch/arm64/boot/dts/qcom/apq8096-db820c.dts   |  1 +
 arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts  |  1 +
 .../arm64/boot/dts/qcom/audioreach-audio.dtsi | 45 ++++++++++
 arch/arm64/boot/dts/qcom/elite-audio.dtsi     | 86 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/msm8916-audio.dtsi   |  5 ++
 arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi  |  1 +
 arch/arm64/boot/dts/qcom/msm8916.dtsi         | 44 ----------
 arch/arm64/boot/dts/qcom/msm8929.dtsi         |  1 +
 arch/arm64/boot/dts/qcom/msm8939-audio.dtsi   |  5 ++
 arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi  |  1 +
 .../qcom/msm8939-sony-xperia-kanuti-tulip.dts |  1 +
 arch/arm64/boot/dts/qcom/msm8939.dtsi         | 44 ----------
 arch/arm64/boot/dts/qcom/msm8953-audio.dtsi   |  5 ++
 arch/arm64/boot/dts/qcom/msm8953.dtsi         | 78 +----------------
 arch/arm64/boot/dts/qcom/msm8996-audio.dtsi   | 14 +++
 .../boot/dts/qcom/msm8996-oneplus-common.dtsi |  1 +
 .../dts/qcom/msm8996-sony-xperia-tone.dtsi    |  1 +
 arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi    |  1 +
 .../boot/dts/qcom/msm8996-xiaomi-gemini.dts   |  1 +
 arch/arm64/boot/dts/qcom/msm8996.dtsi         | 48 +----------
 arch/arm64/boot/dts/qcom/msm8996pro.dtsi      |  1 +
 .../boot/dts/qcom/qcm6490-fairphone-fp5.dts   |  1 +
 arch/arm64/boot/dts/qcom/qcm6490-idp.dts      |  1 +
 .../boot/dts/qcom/qcm6490-shift-otter.dts     |  1 +
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts  |  1 +
 arch/arm64/boot/dts/qcom/qcs8550.dtsi         |  1 +
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dts      |  1 +
 arch/arm64/boot/dts/qcom/sa8540p.dtsi         |  1 +
 arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi  |  5 ++
 .../arm64/boot/dts/qcom/sar2130p-qar2130p.dts |  1 +
 arch/arm64/boot/dts/qcom/sar2130p.dtsi        | 40 +--------
 .../boot/dts/qcom/sc7180-acer-aspire1.dts     |  1 +
 arch/arm64/boot/dts/qcom/sc7180-audio.dtsi    |  8 ++
 arch/arm64/boot/dts/qcom/sc7180-idp.dts       |  1 +
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  |  1 +
 arch/arm64/boot/dts/qcom/sc7180.dtsi          | 56 +-----------
 arch/arm64/boot/dts/qcom/sc7280-audio.dtsi    |  8 ++
 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi      |  1 +
 arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi    |  1 +
 arch/arm64/boot/dts/qcom/sc7280.dtsi          | 68 +--------------
 arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi  |  9 ++
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     |  1 +
 .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts |  1 +
 .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  1 +
 .../dts/qcom/sc8280xp-microsoft-arcata.dts    |  1 +
 .../dts/qcom/sc8280xp-microsoft-blackrock.dts |  1 +
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi        | 38 +-------
 arch/arm64/boot/dts/qcom/sdm630-audio.dtsi    |  8 ++
 .../qcom/sdm630-sony-xperia-ganges-kirin.dts  |  1 +
 .../sdm630-sony-xperia-nile-discovery.dts     |  1 +
 .../qcom/sdm630-sony-xperia-nile-pioneer.dts  |  1 +
 .../qcom/sdm630-sony-xperia-nile-voyager.dts  |  1 +
 arch/arm64/boot/dts/qcom/sdm630.dtsi          | 45 +---------
 arch/arm64/boot/dts/qcom/sdm845-audio.dtsi    |  8 ++
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi    |  1 +
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts    |  1 +
 .../arm64/boot/dts/qcom/sdm845-lg-common.dtsi |  1 +
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts       |  1 +
 .../boot/dts/qcom/sdm845-oneplus-common.dtsi  |  1 +
 .../dts/qcom/sdm845-samsung-starqltechn.dts   |  1 +
 .../boot/dts/qcom/sdm845-shift-axolotl.dts    |  1 +
 .../dts/qcom/sdm845-sony-xperia-tama.dtsi     |  1 +
 .../qcom/sdm845-xiaomi-beryllium-common.dtsi  |  1 +
 .../boot/dts/qcom/sdm845-xiaomi-polaris.dts   |  1 +
 arch/arm64/boot/dts/qcom/sdm845.dtsi          | 49 +----------
 arch/arm64/boot/dts/qcom/sdm850.dtsi          |  1 +
 arch/arm64/boot/dts/qcom/sm4250.dtsi          |  1 +
 arch/arm64/boot/dts/qcom/sm6115-audio.dtsi    |  8 ++
 .../boot/dts/qcom/sm6115-fxtec-pro1x.dts      |  1 +
 arch/arm64/boot/dts/qcom/sm6115.dtsi          | 69 +--------------
 .../boot/dts/qcom/sm6115p-lenovo-j606f.dts    |  1 +
 arch/arm64/boot/dts/qcom/sm6350-audio.dtsi    | 17 ++++
 .../qcom/sm6350-sony-xperia-lena-pdx213.dts   |  1 +
 arch/arm64/boot/dts/qcom/sm6350.dtsi          | 62 +------------
 arch/arm64/boot/dts/qcom/sm7125.dtsi          |  1 +
 arch/arm64/boot/dts/qcom/sm7225.dtsi          |  1 +
 arch/arm64/boot/dts/qcom/sm7325.dtsi          |  1 +
 arch/arm64/boot/dts/qcom/sm8250-audio.dtsi    |  8 ++
 arch/arm64/boot/dts/qcom/sm8250-hdk.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8250-mtp.dts       |  1 +
 .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi |  1 +
 .../dts/qcom/sm8250-xiaomi-elish-common.dtsi  |  1 +
 .../boot/dts/qcom/sm8250-xiaomi-pipa.dts      |  1 +
 arch/arm64/boot/dts/qcom/sm8250.dtsi          | 53 +-----------
 arch/arm64/boot/dts/qcom/sm8350-audio.dtsi    |  8 ++
 arch/arm64/boot/dts/qcom/sm8350-hdk.dts       |  1 +
 .../qcom/sm8350-microsoft-surface-duo2.dts    |  1 +
 arch/arm64/boot/dts/qcom/sm8350-mtp.dts       |  1 +
 .../dts/qcom/sm8350-sony-xperia-sagami.dtsi   |  1 +
 arch/arm64/boot/dts/qcom/sm8350.dtsi          | 67 +--------------
 arch/arm64/boot/dts/qcom/sm8450-audio.dtsi    |  5 ++
 arch/arm64/boot/dts/qcom/sm8450-hdk.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8450-qrd.dts       |  1 +
 .../dts/qcom/sm8450-sony-xperia-nagara.dtsi   |  1 +
 arch/arm64/boot/dts/qcom/sm8450.dtsi          | 40 +--------
 arch/arm64/boot/dts/qcom/sm8550-audio.dtsi    | 10 +++
 arch/arm64/boot/dts/qcom/sm8550-hdk.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8550-mtp.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8550-qrd.dts       |  1 +
 .../boot/dts/qcom/sm8550-samsung-q5q.dts      |  1 +
 .../qcom/sm8550-sony-xperia-yodo-pdx234.dts   |  1 +
 arch/arm64/boot/dts/qcom/sm8550.dtsi          | 45 +---------
 arch/arm64/boot/dts/qcom/sm8650-audio.dtsi    | 10 +++
 arch/arm64/boot/dts/qcom/sm8650-hdk.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8650-mtp.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8650-qrd.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8650.dtsi          | 44 +---------
 arch/arm64/boot/dts/qcom/sm8750-audio.dtsi    | 10 +++
 arch/arm64/boot/dts/qcom/sm8750-mtp.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8750-qrd.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8750.dtsi          | 42 +--------
 .../boot/dts/qcom/x1-asus-zenbook-a14.dtsi    |  1 +
 arch/arm64/boot/dts/qcom/x1-crd.dtsi          |  1 +
 arch/arm64/boot/dts/qcom/x1e001de-devkit.dts  |  1 +
 .../qcom/x1e78100-lenovo-thinkpad-t14s.dtsi   |  1 +
 .../dts/qcom/x1e80100-asus-vivobook-s15.dts   |  1 +
 arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi  |  6 ++
 .../dts/qcom/x1e80100-dell-xps13-9345.dts     |  1 +
 .../dts/qcom/x1e80100-hp-omnibook-x14.dts     |  1 +
 .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  |  1 +
 .../dts/qcom/x1e80100-microsoft-romulus.dtsi  |  1 +
 arch/arm64/boot/dts/qcom/x1e80100-qcp.dts     |  1 +
 arch/arm64/boot/dts/qcom/x1e80100.dtsi        | 43 +---------
 124 files changed, 401 insertions(+), 946 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/audioreach-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/elite-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8916-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8939-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8953-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/msm8996-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sc7280-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sdm630-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm6115-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm6350-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm8250-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm8350-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm8450-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm8550-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm8750-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi

-- 
2.50.0


^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-24  7:23   ` Stephan Gerhold
  2025-07-24 11:32   ` Konrad Dybcio
  2025-07-23 22:27 ` [PATCH 02/23] arm64: dts: qcom: sc8280xp: use dedicated audioreach dtsi srinivas.kandagatla
                   ` (22 subsequent siblings)
  23 siblings, 2 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

All the device tree nodes for audioreach dsp are duplicated across all
the SoC dtsi files, Move this to a dedicated dtsi file so to remove some
duplication, make it consistent across all device trees and also make it
easy for new SoC's to add audio support.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 .../arm64/boot/dts/qcom/audioreach-audio.dtsi | 45 +++++++++++++++++++
 .../boot/dts/qcom/x1-asus-zenbook-a14.dtsi    |  1 +
 arch/arm64/boot/dts/qcom/x1-crd.dtsi          |  1 +
 arch/arm64/boot/dts/qcom/x1e001de-devkit.dts  |  1 +
 .../qcom/x1e78100-lenovo-thinkpad-t14s.dtsi   |  1 +
 .../dts/qcom/x1e80100-asus-vivobook-s15.dts   |  1 +
 arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi  |  6 +++
 .../dts/qcom/x1e80100-dell-xps13-9345.dts     |  1 +
 .../dts/qcom/x1e80100-hp-omnibook-x14.dts     |  1 +
 .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  |  1 +
 .../dts/qcom/x1e80100-microsoft-romulus.dtsi  |  1 +
 arch/arm64/boot/dts/qcom/x1e80100-qcp.dts     |  1 +
 arch/arm64/boot/dts/qcom/x1e80100.dtsi        | 43 ++----------------
 13 files changed, 64 insertions(+), 40 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/audioreach-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/audioreach-audio.dtsi b/arch/arm64/boot/dts/qcom/audioreach-audio.dtsi
new file mode 100644
index 000000000000..fce722579155
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/audioreach-audio.dtsi
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <dt-bindings/soc/qcom,gpr.h>
+#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
+
+&gpr {
+	compatible = "qcom,gpr";
+	qcom,glink-channels = "adsp_apps";
+	qcom,domain = <GPR_DOMAIN_ID_ADSP>;
+	qcom,intents = <512 20>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	q6apm: service@1 {
+		compatible = "qcom,q6apm";
+		reg = <GPR_APM_MODULE_IID>;
+		#sound-dai-cells = <0>;
+		qcom,protection-domain = "avs/audio",
+					 "msm/adsp/audio_pd";
+
+		q6apmbedai: bedais {
+			compatible = "qcom,q6apm-lpass-dais";
+			#sound-dai-cells = <1>;
+		};
+
+		q6apmdai: dais {
+			compatible = "qcom,q6apm-dais";
+		};
+	};
+
+	q6prm: service@2 {
+		compatible = "qcom,q6prm";
+		reg = <GPR_PRM_MODULE_IID>;
+		qcom,protection-domain = "avs/audio",
+					 "msm/adsp/audio_pd";
+
+		q6prmcc: clock-controller {
+			compatible = "qcom,q6prm-lpass-clocks";
+			#clock-cells = <2>;
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi b/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
index c771fd1d8029..1d8a75fba301 100644
--- a/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
@@ -11,6 +11,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
+#include "x1e80100-audio.dtsi"
 #include "x1e80100-pmics.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/x1-crd.dtsi b/arch/arm64/boot/dts/qcom/x1-crd.dtsi
index c9f0d5052670..19b993fdd17f 100644
--- a/arch/arm64/boot/dts/qcom/x1-crd.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1-crd.dtsi
@@ -9,6 +9,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
+#include "x1e80100-audio.dtsi"
 #include "x1e80100-pmics.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
index 2d9627e6c798..6df3ee553bc7 100644
--- a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
+++ b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
@@ -10,6 +10,7 @@
 
 #include "x1e80100.dtsi"
 #include "x1e80100-pmics.dtsi"
+#include "x1e80100-audio.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. X1E001DE Snapdragon Devkit for Windows";
diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
index ac1dddf27da3..cf2cf3e520fa 100644
--- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
@@ -13,6 +13,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "x1e80100.dtsi"
+#include "x1e80100-audio.dtsi"
 #include "x1e80100-pmics.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
index 71b2cc6c392f..82b08350da17 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
@@ -13,6 +13,7 @@
 
 #include "x1e80100.dtsi"
 #include "x1e80100-pmics.dtsi"
+#include "x1e80100-audio.dtsi"
 
 / {
 	model = "ASUS Vivobook S 15";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
new file mode 100644
index 000000000000..e03441bb2a79
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
@@ -0,0 +1,6 @@
+#include "audioreach-audio.dtsi"
+
+&q6apmdai{
+	iommus = <&apps_smmu 0x1001 0x80>,
+		 <&apps_smmu 0x1061 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
index fd00d1bf12e1..fb98fdc53594 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
@@ -14,6 +14,7 @@
 
 #include "x1e80100.dtsi"
 #include "x1e80100-pmics.dtsi"
+#include "x1e80100-audio.dtsi"
 
 / {
 	model = "Dell XPS 13 9345";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts b/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
index 8d2a9b7f4730..8206b6f2cf30 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
@@ -14,6 +14,7 @@
 
 #include "x1e80100.dtsi"
 #include "x1e80100-pmics.dtsi"
+#include "x1e80100-audio.dtsi"
 
 / {
 	model = "HP Omnibook X 14";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
index d02f8d4f7baf..aed5554c6646 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
@@ -11,6 +11,7 @@
 
 #include "x1e80100.dtsi"
 #include "x1e80100-pmics.dtsi"
+#include "x1e80100-audio.dtsi"
 
 / {
 	model = "Lenovo Yoga Slim 7x";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
index 0fd8516580b2..669b95dc1666 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
@@ -11,6 +11,7 @@
 
 #include "x1e80100.dtsi"
 #include "x1e80100-pmics.dtsi"
+#include "x1e80100-audio.dtsi"
 
 / {
 	aliases {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
index 4dfba835af6a..9e464d001343 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
@@ -10,6 +10,7 @@
 
 #include "x1e80100.dtsi"
 #include "x1e80100-pmics.dtsi"
+#include "x1e80100-audio.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. X1E80100 QCP";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
index 5e9a8fa3cf96..f3216a84137e 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
@@ -17,7 +17,6 @@
 #include <dt-bindings/phy/phy-qcom-qmp.h>
 #include <dt-bindings/power/qcom,rpmhpd.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
-#include <dt-bindings/soc/qcom,gpr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -4041,6 +4040,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
+				gpr: gpr {
+				};
+
 				fastrpc {
 					compatible = "qcom,fastrpc";
 					qcom,glink-channels = "fastrpcglink-apps-dsp";
@@ -4090,45 +4092,6 @@ compute-cb@7 {
 					};
 				};
 
-				gpr {
-					compatible = "qcom,gpr";
-					qcom,glink-channels = "adsp_apps";
-					qcom,domain = <GPR_DOMAIN_ID_ADSP>;
-					qcom,intents = <512 20>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					q6apm: service@1 {
-						compatible = "qcom,q6apm";
-						reg = <GPR_APM_MODULE_IID>;
-						#sound-dai-cells = <0>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6apmbedai: bedais {
-							compatible = "qcom,q6apm-lpass-dais";
-							#sound-dai-cells = <1>;
-						};
-
-						q6apmdai: dais {
-							compatible = "qcom,q6apm-dais";
-							iommus = <&apps_smmu 0x1001 0x80>,
-								 <&apps_smmu 0x1061 0x0>;
-						};
-					};
-
-					q6prm: service@2 {
-						compatible = "qcom,q6prm";
-						reg = <GPR_PRM_MODULE_IID>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6prmcc: clock-controller {
-							compatible = "qcom,q6prm-lpass-clocks";
-							#clock-cells = <2>;
-						};
-					};
-				};
 			};
 		};
 
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts
  2025-07-23 22:27 ` [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts srinivas.kandagatla
@ 2025-07-24  7:23   ` Stephan Gerhold
  2025-07-24  9:50     ` Srinivas Kandagatla
  2025-07-24 11:32   ` Konrad Dybcio
  1 sibling, 1 reply; 39+ messages in thread
From: Stephan Gerhold @ 2025-07-24  7:23 UTC (permalink / raw)
  To: srinivas.kandagatla
  Cc: andersson, konradybcio, robh, krzk+dt, conor+dt,
	cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On Wed, Jul 23, 2025 at 11:27:15PM +0100,
srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> All the device tree nodes for audioreach dsp are duplicated across all
> the SoC dtsi files, Move this to a dedicated dtsi file so to remove some
> duplication, make it consistent across all device trees and also make it
> easy for new SoC's to add audio support.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>  .../arm64/boot/dts/qcom/audioreach-audio.dtsi | 45 +++++++++++++++++++
>  .../boot/dts/qcom/x1-asus-zenbook-a14.dtsi    |  1 +
>  arch/arm64/boot/dts/qcom/x1-crd.dtsi          |  1 +
>  arch/arm64/boot/dts/qcom/x1e001de-devkit.dts  |  1 +
>  .../qcom/x1e78100-lenovo-thinkpad-t14s.dtsi   |  1 +
>  .../dts/qcom/x1e80100-asus-vivobook-s15.dts   |  1 +
>  arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi  |  6 +++
>  .../dts/qcom/x1e80100-dell-xps13-9345.dts     |  1 +
>  .../dts/qcom/x1e80100-hp-omnibook-x14.dts     |  1 +
>  .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  |  1 +
>  .../dts/qcom/x1e80100-microsoft-romulus.dtsi  |  1 +
>  arch/arm64/boot/dts/qcom/x1e80100-qcp.dts     |  1 +
>  arch/arm64/boot/dts/qcom/x1e80100.dtsi        | 43 ++----------------
>  13 files changed, 64 insertions(+), 40 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/audioreach-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
> 
> [...]
> diff --git a/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi b/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
> index c771fd1d8029..1d8a75fba301 100644
> --- a/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
> +++ b/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
> @@ -11,6 +11,7 @@
>  #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>  
> +#include "x1e80100-audio.dtsi"
>  #include "x1e80100-pmics.dtsi"
>  
>  / {
> diff --git a/arch/arm64/boot/dts/qcom/x1-crd.dtsi b/arch/arm64/boot/dts/qcom/x1-crd.dtsi
> index c9f0d5052670..19b993fdd17f 100644
> --- a/arch/arm64/boot/dts/qcom/x1-crd.dtsi
> +++ b/arch/arm64/boot/dts/qcom/x1-crd.dtsi
> @@ -9,6 +9,7 @@
>  #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>  
> +#include "x1e80100-audio.dtsi"
>  #include "x1e80100-pmics.dtsi"
>  
>  / {
> diff --git a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
> index 2d9627e6c798..6df3ee553bc7 100644
> --- a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
> +++ b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
> @@ -10,6 +10,7 @@
>  
>  #include "x1e80100.dtsi"
>  #include "x1e80100-pmics.dtsi"
> +#include "x1e80100-audio.dtsi"
>  
>  / {
>  	model = "Qualcomm Technologies, Inc. X1E001DE Snapdragon Devkit for Windows";
> diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
> index ac1dddf27da3..cf2cf3e520fa 100644
> --- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
> +++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
> @@ -13,6 +13,7 @@
>  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>  
>  #include "x1e80100.dtsi"
> +#include "x1e80100-audio.dtsi"
>  #include "x1e80100-pmics.dtsi"
>  
>  / {
> diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
> index 71b2cc6c392f..82b08350da17 100644
> --- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
> +++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
> @@ -13,6 +13,7 @@
>  
>  #include "x1e80100.dtsi"
>  #include "x1e80100-pmics.dtsi"
> +#include "x1e80100-audio.dtsi"
>  
>  / {
>  	model = "ASUS Vivobook S 15";
> diff --git a/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
> new file mode 100644
> index 000000000000..e03441bb2a79
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
> @@ -0,0 +1,6 @@
> +#include "audioreach-audio.dtsi"
> +
> +&q6apmdai{
> +	iommus = <&apps_smmu 0x1001 0x80>,
> +		 <&apps_smmu 0x1061 0x0>;
> +};

I think you should inline this into x1e80100.dtsi and drop the extra
#include from all the device DTs. x1e80100.dtsi already references
audioreach nodes, so it's not possible to build without including
x1e80100-audio.dtsi anyway:

../arch/arm64/boot/dts/qcom/x1e80100.dtsi:4098.34-4114.5: ERROR (phandle_references): /soc@0/codec@6aa0000: Reference to non-existent node or label "q6prmcc"
../arch/arm64/boot/dts/qcom/x1e80100.dtsi:4320.31-4436.5: ERROR (phandle_references): /soc@0/pinctrl@6e80000: Reference to non-existent node or label "q6prmcc"

Thanks,
Stephan

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts
  2025-07-24  7:23   ` Stephan Gerhold
@ 2025-07-24  9:50     ` Srinivas Kandagatla
  0 siblings, 0 replies; 39+ messages in thread
From: Srinivas Kandagatla @ 2025-07-24  9:50 UTC (permalink / raw)
  To: Stephan Gerhold
  Cc: andersson, konradybcio, robh, krzk+dt, conor+dt,
	cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On 7/24/25 8:23 AM, Stephan Gerhold wrote:
> On Wed, Jul 23, 2025 at 11:27:15PM +0100,
> srinivas.kandagatla@oss.qualcomm.com wrote:
>> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
>>
>> All the device tree nodes for audioreach dsp are duplicated across all
>> the SoC dtsi files, Move this to a dedicated dtsi file so to remove some
>> duplication, make it consistent across all device trees and also make it
>> easy for new SoC's to add audio support.
>>
>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
>> ---
>>  .../arm64/boot/dts/qcom/audioreach-audio.dtsi | 45 +++++++++++++++++++
>>  .../boot/dts/qcom/x1-asus-zenbook-a14.dtsi    |  1 +
>>  arch/arm64/boot/dts/qcom/x1-crd.dtsi          |  1 +
>>  arch/arm64/boot/dts/qcom/x1e001de-devkit.dts  |  1 +
>>  .../qcom/x1e78100-lenovo-thinkpad-t14s.dtsi   |  1 +
>>  .../dts/qcom/x1e80100-asus-vivobook-s15.dts   |  1 +
>>  arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi  |  6 +++
>>  .../dts/qcom/x1e80100-dell-xps13-9345.dts     |  1 +
>>  .../dts/qcom/x1e80100-hp-omnibook-x14.dts     |  1 +
>>  .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  |  1 +
>>  .../dts/qcom/x1e80100-microsoft-romulus.dtsi  |  1 +
>>  arch/arm64/boot/dts/qcom/x1e80100-qcp.dts     |  1 +
>>  arch/arm64/boot/dts/qcom/x1e80100.dtsi        | 43 ++----------------
>>  13 files changed, 64 insertions(+), 40 deletions(-)
>>  create mode 100644 arch/arm64/boot/dts/qcom/audioreach-audio.dtsi
>>  create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
>>
>> [...]
>> diff --git a/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi b/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
>> index c771fd1d8029..1d8a75fba301 100644
>> --- a/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
>> @@ -11,6 +11,7 @@
>>  #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>>  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>>  
>> +#include "x1e80100-audio.dtsi"
>>  #include "x1e80100-pmics.dtsi"
>>  
>>  / {
>> diff --git a/arch/arm64/boot/dts/qcom/x1-crd.dtsi b/arch/arm64/boot/dts/qcom/x1-crd.dtsi
>> index c9f0d5052670..19b993fdd17f 100644
>> --- a/arch/arm64/boot/dts/qcom/x1-crd.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/x1-crd.dtsi
>> @@ -9,6 +9,7 @@
>>  #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>>  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>>  
>> +#include "x1e80100-audio.dtsi"
>>  #include "x1e80100-pmics.dtsi"
>>  
>>  / {
>> diff --git a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
>> index 2d9627e6c798..6df3ee553bc7 100644
>> --- a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
>> +++ b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
>> @@ -10,6 +10,7 @@
>>  
>>  #include "x1e80100.dtsi"
>>  #include "x1e80100-pmics.dtsi"
>> +#include "x1e80100-audio.dtsi"
>>  
>>  / {
>>  	model = "Qualcomm Technologies, Inc. X1E001DE Snapdragon Devkit for Windows";
>> diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
>> index ac1dddf27da3..cf2cf3e520fa 100644
>> --- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
>> @@ -13,6 +13,7 @@
>>  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>>  
>>  #include "x1e80100.dtsi"
>> +#include "x1e80100-audio.dtsi"
>>  #include "x1e80100-pmics.dtsi"
>>  
>>  / {
>> diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
>> index 71b2cc6c392f..82b08350da17 100644
>> --- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
>> +++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
>> @@ -13,6 +13,7 @@
>>  
>>  #include "x1e80100.dtsi"
>>  #include "x1e80100-pmics.dtsi"
>> +#include "x1e80100-audio.dtsi"
>>  
>>  / {
>>  	model = "ASUS Vivobook S 15";
>> diff --git a/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
>> new file mode 100644
>> index 000000000000..e03441bb2a79
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
>> @@ -0,0 +1,6 @@
>> +#include "audioreach-audio.dtsi"
>> +
>> +&q6apmdai{
>> +	iommus = <&apps_smmu 0x1001 0x80>,
>> +		 <&apps_smmu 0x1061 0x0>;
>> +};
> 
> I think you should inline this into x1e80100.dtsi and drop the extra
> #include from all the device DTs. x1e80100.dtsi already references
> audioreach nodes, so it's not possible to build without including
> x1e80100-audio.dtsi anyway:
thanks Stephan,

Yes, we can not build it without audio.dtsi, as suggested inlining this
in to end of SoC dtsi should help.

--srini

> 
> ../arch/arm64/boot/dts/qcom/x1e80100.dtsi:4098.34-4114.5: ERROR (phandle_references): /soc@0/codec@6aa0000: Reference to non-existent node or label "q6prmcc"
> ../arch/arm64/boot/dts/qcom/x1e80100.dtsi:4320.31-4436.5: ERROR (phandle_references): /soc@0/pinctrl@6e80000: Reference to non-existent node or label "q6prmcc"
> 
> Thanks,
> Stephan


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts
  2025-07-23 22:27 ` [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts srinivas.kandagatla
  2025-07-24  7:23   ` Stephan Gerhold
@ 2025-07-24 11:32   ` Konrad Dybcio
  1 sibling, 0 replies; 39+ messages in thread
From: Konrad Dybcio @ 2025-07-24 11:32 UTC (permalink / raw)
  To: srinivas.kandagatla, andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel

On 7/24/25 12:27 AM, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> All the device tree nodes for audioreach dsp are duplicated across all
> the SoC dtsi files, Move this to a dedicated dtsi file so to remove some
> duplication, make it consistent across all device trees and also make it
> easy for new SoC's to add audio support.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---

[...]

> -				gpr {
> -					compatible = "qcom,gpr";
> -					qcom,glink-channels = "adsp_apps";

This seems to never change, maybe we can add some internal bus-like
matching to glink that we could put a cookie in the GPR driver for?

> -					qcom,domain = <GPR_DOMAIN_ID_ADSP>;

Similarly, this never changes (unless call audio would go through
modem and require a similar structure or something, I really don't
know)

> -					qcom,intents = <512 20>;

This is also always the very same

> -					#address-cells = <1>;
> -					#size-cells = <0>;
> -
> -					q6apm: service@1 {
> -						compatible = "qcom,q6apm";
> -						reg = <GPR_APM_MODULE_IID>;
> -						#sound-dai-cells = <0>;
> -						qcom,protection-domain = "avs/audio",
> -									 "msm/adsp/audio_pd";

These never change either

Konrad

^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 02/23] arm64: dts: qcom: sc8280xp: use dedicated audioreach dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 03/23] arm64: dts: qcom: sm8650: " srinivas.kandagatla
                   ` (21 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sa8540p.dtsi         |  1 +
 arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi  |  9 +++++
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     |  1 +
 .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts |  1 +
 .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  1 +
 .../dts/qcom/sc8280xp-microsoft-arcata.dts    |  1 +
 .../dts/qcom/sc8280xp-microsoft-blackrock.dts |  1 +
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi        | 38 +------------------
 8 files changed, 17 insertions(+), 36 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sa8540p.dtsi b/arch/arm64/boot/dts/qcom/sa8540p.dtsi
index 23888029cc11..56cb8d4e19ec 100644
--- a/arch/arm64/boot/dts/qcom/sa8540p.dtsi
+++ b/arch/arm64/boot/dts/qcom/sa8540p.dtsi
@@ -5,6 +5,7 @@
  */
 
 #include "sc8280xp.dtsi"
+#include "sc8280xp-audio.dtsi"
 
 /delete-node/ &cpu0_opp_table;
 /delete-node/ &cpu4_opp_table;
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi
new file mode 100644
index 000000000000..5472f59d4301
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "audioreach-audio.dtsi"
+
+&q6apmdai{
+	iommus = <&apps_smmu 0x0c01 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 8e2c02497c05..249f359580da 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -10,6 +10,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "sc8280xp.dtsi"
+#include "sc8280xp-audio.dtsi"
 #include "sc8280xp-pmics.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
index 1667c7157057..0f3d82547a3c 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
@@ -19,6 +19,7 @@
 #include <dt-bindings/phy/phy.h>
 
 #include "sc8280xp.dtsi"
+#include "sc8280xp-audio.dtsi"
 #include "sc8280xp-pmics.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index cefecb7a23cf..c0842d5120fc 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -14,6 +14,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "sc8280xp.dtsi"
+#include "sc8280xp-audio.dtsi"
 #include "sc8280xp-pmics.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
index d00889fa6f0b..2c0c1b54f916 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
@@ -9,6 +9,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "sc8280xp.dtsi"
+#include "sc8280xp-audio.dtsi"
 #include "sc8280xp-pmics.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
index 812251324002..0f03b0ef97ad 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
@@ -15,6 +15,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "sc8280xp.dtsi"
+#include "sc8280xp-audio.dtsi"
 #include "sc8280xp-pmics.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 87555a119d94..73d243c21958 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -16,7 +16,6 @@
 #include <dt-bindings/mailbox/qcom-ipcc.h>
 #include <dt-bindings/phy/phy-qcom-qmp.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
-#include <dt-bindings/soc/qcom,gpr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -2592,42 +2591,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
-				gpr {
-					compatible = "qcom,gpr";
-					qcom,glink-channels = "adsp_apps";
-					qcom,domain = <GPR_DOMAIN_ID_ADSP>;
-					qcom,intents = <512 20>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					q6apm: service@1 {
-						compatible = "qcom,q6apm";
-						reg = <GPR_APM_MODULE_IID>;
-						#sound-dai-cells = <0>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-						q6apmdai: dais {
-							compatible = "qcom,q6apm-dais";
-							iommus = <&apps_smmu 0x0c01 0x0>;
-						};
-
-						q6apmbedai: bedais {
-							compatible = "qcom,q6apm-lpass-dais";
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6prm: service@2 {
-						compatible = "qcom,q6prm";
-						reg = <GPR_PRM_MODULE_IID>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-						q6prmcc: clock-controller {
-							compatible = "qcom,q6prm-lpass-clocks";
-							#clock-cells = <2>;
-						};
-					};
+				gpr: gpr {
 				};
+
 			};
 		};
 
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 03/23] arm64: dts: qcom: sm8650: use dedicated audioreach dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 02/23] arm64: dts: qcom: sc8280xp: use dedicated audioreach dtsi srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-24  8:26   ` neil.armstrong
  2025-07-23 22:27 ` [PATCH 04/23] arm64: dts: qcom: sm8550: " srinivas.kandagatla
                   ` (20 subsequent siblings)
  23 siblings, 1 reply; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8650-audio.dtsi | 10 +++++
 arch/arm64/boot/dts/qcom/sm8650-hdk.dts    |  1 +
 arch/arm64/boot/dts/qcom/sm8650-mtp.dts    |  1 +
 arch/arm64/boot/dts/qcom/sm8650-qrd.dts    |  1 +
 arch/arm64/boot/dts/qcom/sm8650.dtsi       | 43 ++--------------------
 5 files changed, 16 insertions(+), 40 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm8650-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm8650-audio.dtsi b/arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
new file mode 100644
index 000000000000..14ae50e72e4b
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "audioreach-audio.dtsi"
+
+&q6apmdai{
+	iommus = <&apps_smmu 0x1001 0x80>,
+		 <&apps_smmu 0x1061 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
index 259649d7dcd7..94fa52437d79 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
@@ -8,6 +8,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8650.dtsi"
+#include "sm8650-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #include "pm8550b.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
index 8a957adbfb38..07e62918422e 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8650.dtsi"
+#include "sm8650-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #include "pm8550b.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
index 7552d5d3fb40..7f26095e6f07 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
@@ -8,6 +8,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8650.dtsi"
+#include "sm8650-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #include "pm8550b.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
index e14d3d778b71..5212000bf34c 100644
--- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
@@ -23,7 +23,6 @@
 #include <dt-bindings/power/qcom,rpmhpd.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/reset/qcom,sm8650-gpucc.h>
-#include <dt-bindings/soc/qcom,gpr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -4447,6 +4446,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 
 				label = "lpass";
 
+				gpr: gpr {
+				};
+
 				fastrpc {
 					compatible = "qcom,fastrpc";
 
@@ -4506,45 +4508,6 @@ compute-cb@7 {
 					};
 				};
 
-				gpr {
-					compatible = "qcom,gpr";
-					qcom,glink-channels = "adsp_apps";
-					qcom,domain = <GPR_DOMAIN_ID_ADSP>;
-					qcom,intents = <512 20>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					q6apm: service@1 {
-						compatible = "qcom,q6apm";
-						reg = <GPR_APM_MODULE_IID>;
-						#sound-dai-cells = <0>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6apmbedai: bedais {
-							compatible = "qcom,q6apm-lpass-dais";
-							#sound-dai-cells = <1>;
-						};
-
-						q6apmdai: dais {
-							compatible = "qcom,q6apm-dais";
-							iommus = <&apps_smmu 0x1001 0x80>,
-								 <&apps_smmu 0x1061 0x0>;
-						};
-					};
-
-					q6prm: service@2 {
-						compatible = "qcom,q6prm";
-						reg = <GPR_PRM_MODULE_IID>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6prmcc: clock-controller {
-							compatible = "qcom,q6prm-lpass-clocks";
-							#clock-cells = <2>;
-						};
-					};
-				};
 			};
 		};
 
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 03/23] arm64: dts: qcom: sm8650: use dedicated audioreach dtsi
  2025-07-23 22:27 ` [PATCH 03/23] arm64: dts: qcom: sm8650: " srinivas.kandagatla
@ 2025-07-24  8:26   ` neil.armstrong
  2025-07-24  9:54     ` Srinivas Kandagatla
  0 siblings, 1 reply; 39+ messages in thread
From: neil.armstrong @ 2025-07-24  8:26 UTC (permalink / raw)
  To: srinivas.kandagatla, andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel

On 24/07/2025 00:27, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi.
> This move removes duplication.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>   arch/arm64/boot/dts/qcom/sm8650-audio.dtsi | 10 +++++
>   arch/arm64/boot/dts/qcom/sm8650-hdk.dts    |  1 +
>   arch/arm64/boot/dts/qcom/sm8650-mtp.dts    |  1 +
>   arch/arm64/boot/dts/qcom/sm8650-qrd.dts    |  1 +
>   arch/arm64/boot/dts/qcom/sm8650.dtsi       | 43 ++--------------------
>   5 files changed, 16 insertions(+), 40 deletions(-)
>   create mode 100644 arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8650-audio.dtsi b/arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
> new file mode 100644
> index 000000000000..14ae50e72e4b
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
> @@ -0,0 +1,10 @@
> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +#include "audioreach-audio.dtsi"
> +
> +&q6apmdai{
> +	iommus = <&apps_smmu 0x1001 0x80>,
> +		 <&apps_smmu 0x1061 0x0>;

As patch 1 comment, I'm not fan either of this intermediate dtsi, or perhaps there's
some bigger plans for those files ?

Anyway per-se, it's not necessary and it should be in the SoC dtsi.

Thanks,
Neil

> +};
> diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
> index 259649d7dcd7..94fa52437d79 100644
> --- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
> @@ -8,6 +8,7 @@
>   #include <dt-bindings/leds/common.h>
>   #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>   #include "sm8650.dtsi"
> +#include "sm8650-audio.dtsi"
>   #include "pm8010.dtsi"
>   #include "pm8550.dtsi"
>   #include "pm8550b.dtsi"
> diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
> index 8a957adbfb38..07e62918422e 100644
> --- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
> @@ -7,6 +7,7 @@
>   
>   #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>   #include "sm8650.dtsi"
> +#include "sm8650-audio.dtsi"
>   #include "pm8010.dtsi"
>   #include "pm8550.dtsi"
>   #include "pm8550b.dtsi"
> diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
> index 7552d5d3fb40..7f26095e6f07 100644
> --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
> @@ -8,6 +8,7 @@
>   #include <dt-bindings/leds/common.h>
>   #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>   #include "sm8650.dtsi"
> +#include "sm8650-audio.dtsi"
>   #include "pm8010.dtsi"
>   #include "pm8550.dtsi"
>   #include "pm8550b.dtsi"
> diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
> index e14d3d778b71..5212000bf34c 100644
> --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
> @@ -23,7 +23,6 @@
>   #include <dt-bindings/power/qcom,rpmhpd.h>
>   #include <dt-bindings/power/qcom-rpmpd.h>
>   #include <dt-bindings/reset/qcom,sm8650-gpucc.h>
> -#include <dt-bindings/soc/qcom,gpr.h>
>   #include <dt-bindings/soc/qcom,rpmh-rsc.h>
>   #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
>   #include <dt-bindings/thermal/thermal.h>
> @@ -4447,6 +4446,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
>   
>   				label = "lpass";
>   
> +				gpr: gpr {
> +				};
> +
>   				fastrpc {
>   					compatible = "qcom,fastrpc";
>   
> @@ -4506,45 +4508,6 @@ compute-cb@7 {
>   					};
>   				};
>   
> -				gpr {
> -					compatible = "qcom,gpr";
> -					qcom,glink-channels = "adsp_apps";
> -					qcom,domain = <GPR_DOMAIN_ID_ADSP>;
> -					qcom,intents = <512 20>;
> -					#address-cells = <1>;
> -					#size-cells = <0>;
> -
> -					q6apm: service@1 {
> -						compatible = "qcom,q6apm";
> -						reg = <GPR_APM_MODULE_IID>;
> -						#sound-dai-cells = <0>;
> -						qcom,protection-domain = "avs/audio",
> -									 "msm/adsp/audio_pd";
> -
> -						q6apmbedai: bedais {
> -							compatible = "qcom,q6apm-lpass-dais";
> -							#sound-dai-cells = <1>;
> -						};
> -
> -						q6apmdai: dais {
> -							compatible = "qcom,q6apm-dais";
> -							iommus = <&apps_smmu 0x1001 0x80>,
> -								 <&apps_smmu 0x1061 0x0>;
> -						};
> -					};
> -
> -					q6prm: service@2 {
> -						compatible = "qcom,q6prm";
> -						reg = <GPR_PRM_MODULE_IID>;
> -						qcom,protection-domain = "avs/audio",
> -									 "msm/adsp/audio_pd";
> -
> -						q6prmcc: clock-controller {
> -							compatible = "qcom,q6prm-lpass-clocks";
> -							#clock-cells = <2>;
> -						};
> -					};
> -				};
>   			};
>   		};
>   


^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: [PATCH 03/23] arm64: dts: qcom: sm8650: use dedicated audioreach dtsi
  2025-07-24  8:26   ` neil.armstrong
@ 2025-07-24  9:54     ` Srinivas Kandagatla
  0 siblings, 0 replies; 39+ messages in thread
From: Srinivas Kandagatla @ 2025-07-24  9:54 UTC (permalink / raw)
  To: Neil Armstrong, andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel

On 7/24/25 9:26 AM, neil.armstrong@linaro.org wrote:
> On 24/07/2025 00:27, srinivas.kandagatla@oss.qualcomm.com wrote:
>> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
>>
>> Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi.
>> This move removes duplication.
>>
>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
>> ---
>>   arch/arm64/boot/dts/qcom/sm8650-audio.dtsi | 10 +++++
>>   arch/arm64/boot/dts/qcom/sm8650-hdk.dts    |  1 +
>>   arch/arm64/boot/dts/qcom/sm8650-mtp.dts    |  1 +
>>   arch/arm64/boot/dts/qcom/sm8650-qrd.dts    |  1 +
>>   arch/arm64/boot/dts/qcom/sm8650.dtsi       | 43 ++--------------------
>>   5 files changed, 16 insertions(+), 40 deletions(-)
>>   create mode 100644 arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm8650-audio.dtsi b/arch/arm64/
>> boot/dts/qcom/sm8650-audio.dtsi
>> new file mode 100644
>> index 000000000000..14ae50e72e4b
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
>> @@ -0,0 +1,10 @@
>> +// SPDX-License-Identifier: BSD-3-Clause
>> +/*
>> + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights
>> reserved.
>> + */
>> +#include "audioreach-audio.dtsi"
>> +
>> +&q6apmdai{
>> +    iommus = <&apps_smmu 0x1001 0x80>,
>> +         <&apps_smmu 0x1061 0x0>;
> 
> As patch 1 comment, I'm not fan either of this intermediate dtsi, or
> perhaps there's
> some bigger plans for those files ?

Thanks Neil,

It more of duplicating the same thing over and over and i expect them to
consistent across all the SoCs, however its not the case, some of stuff
that needs to be in board level dts is now added into SoC level dtsi..

Moving to intermediate dtsi could avoid things like this.

> 
> Anyway per-se, it's not necessary and it should be in the SoC dtsi.
Will give that a go with some inline include in SoC dtsi.

> 
> Thanks,
> Neil
> 
>> +};
>> diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/
>> boot/dts/qcom/sm8650-hdk.dts
>> index 259649d7dcd7..94fa52437d79 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
>> @@ -8,6 +8,7 @@
>>   #include <dt-bindings/leds/common.h>
>>   #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>>   #include "sm8650.dtsi"
>> +#include "sm8650-audio.dtsi"
>>   #include "pm8010.dtsi"
>>   #include "pm8550.dtsi"
>>   #include "pm8550b.dtsi"
>> diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/
>> boot/dts/qcom/sm8650-mtp.dts
>> index 8a957adbfb38..07e62918422e 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts
>> @@ -7,6 +7,7 @@
>>     #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>>   #include "sm8650.dtsi"
>> +#include "sm8650-audio.dtsi"
>>   #include "pm8010.dtsi"
>>   #include "pm8550.dtsi"
>>   #include "pm8550b.dtsi"
>> diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/
>> boot/dts/qcom/sm8650-qrd.dts
>> index 7552d5d3fb40..7f26095e6f07 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
>> @@ -8,6 +8,7 @@
>>   #include <dt-bindings/leds/common.h>
>>   #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>>   #include "sm8650.dtsi"
>> +#include "sm8650-audio.dtsi"
>>   #include "pm8010.dtsi"
>>   #include "pm8550.dtsi"
>>   #include "pm8550b.dtsi"
>> diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/
>> dts/qcom/sm8650.dtsi
>> index e14d3d778b71..5212000bf34c 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
>> @@ -23,7 +23,6 @@
>>   #include <dt-bindings/power/qcom,rpmhpd.h>
>>   #include <dt-bindings/power/qcom-rpmpd.h>
>>   #include <dt-bindings/reset/qcom,sm8650-gpucc.h>
>> -#include <dt-bindings/soc/qcom,gpr.h>
>>   #include <dt-bindings/soc/qcom,rpmh-rsc.h>
>>   #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
>>   #include <dt-bindings/thermal/thermal.h>
>> @@ -4447,6 +4446,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
>>                     label = "lpass";
>>   +                gpr: gpr {
>> +                };
>> +
>>                   fastrpc {
>>                       compatible = "qcom,fastrpc";
>>   @@ -4506,45 +4508,6 @@ compute-cb@7 {
>>                       };
>>                   };
>>   -                gpr {
>> -                    compatible = "qcom,gpr";
>> -                    qcom,glink-channels = "adsp_apps";
>> -                    qcom,domain = <GPR_DOMAIN_ID_ADSP>;
>> -                    qcom,intents = <512 20>;
>> -                    #address-cells = <1>;
>> -                    #size-cells = <0>;
>> -
>> -                    q6apm: service@1 {
>> -                        compatible = "qcom,q6apm";
>> -                        reg = <GPR_APM_MODULE_IID>;
>> -                        #sound-dai-cells = <0>;
>> -                        qcom,protection-domain = "avs/audio",
>> -                                     "msm/adsp/audio_pd";
>> -
>> -                        q6apmbedai: bedais {
>> -                            compatible = "qcom,q6apm-lpass-dais";
>> -                            #sound-dai-cells = <1>;
>> -                        };
>> -
>> -                        q6apmdai: dais {
>> -                            compatible = "qcom,q6apm-dais";
>> -                            iommus = <&apps_smmu 0x1001 0x80>,
>> -                                 <&apps_smmu 0x1061 0x0>;
>> -                        };
>> -                    };
>> -
>> -                    q6prm: service@2 {
>> -                        compatible = "qcom,q6prm";
>> -                        reg = <GPR_PRM_MODULE_IID>;
>> -                        qcom,protection-domain = "avs/audio",
>> -                                     "msm/adsp/audio_pd";
>> -
>> -                        q6prmcc: clock-controller {
>> -                            compatible = "qcom,q6prm-lpass-clocks";
>> -                            #clock-cells = <2>;
>> -                        };
>> -                    };
>> -                };
>>               };
>>           };
>>   
> 


^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 04/23] arm64: dts: qcom: sm8550: use dedicated audioreach dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (2 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 03/23] arm64: dts: qcom: sm8650: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 05/23] arm64: dts: qcom: sm8450: " srinivas.kandagatla
                   ` (19 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/qcs8550.dtsi         |  1 +
 arch/arm64/boot/dts/qcom/sm8550-audio.dtsi    | 10 +++++
 arch/arm64/boot/dts/qcom/sm8550-hdk.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8550-mtp.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8550-qrd.dts       |  1 +
 .../boot/dts/qcom/sm8550-samsung-q5q.dts      |  1 +
 .../qcom/sm8550-sony-xperia-yodo-pdx234.dts   |  1 +
 arch/arm64/boot/dts/qcom/sm8550.dtsi          | 44 ++-----------------
 8 files changed, 19 insertions(+), 41 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm8550-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/qcs8550.dtsi b/arch/arm64/boot/dts/qcom/qcs8550.dtsi
index f0acdd0b1e93..8cdb14ed8b53 100644
--- a/arch/arm64/boot/dts/qcom/qcs8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs8550.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include "sm8550.dtsi"
+#include "sm8550-audio.dtsi"
 
 /delete-node/ &reserved_memory;
 
diff --git a/arch/arm64/boot/dts/qcom/sm8550-audio.dtsi b/arch/arm64/boot/dts/qcom/sm8550-audio.dtsi
new file mode 100644
index 000000000000..14ae50e72e4b
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8550-audio.dtsi
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "audioreach-audio.dtsi"
+
+&q6apmdai{
+	iommus = <&apps_smmu 0x1001 0x80>,
+		 <&apps_smmu 0x1061 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
index 9dfb248f9ab5..c17851945b6e 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
@@ -8,6 +8,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8550.dtsi"
+#include "sm8550-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #include "pm8550b.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
index fdcecd41297d..9decdc32622b 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8550.dtsi"
+#include "sm8550-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #include "pm8550b.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index 49438a7e77ce..6b80888c030d 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -8,6 +8,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8550.dtsi"
+#include "sm8550-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #include "pm8550b.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts b/arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts
index 7d29a57a2b54..2c36e9ca78c2 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts
@@ -10,6 +10,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8550.dtsi"
+#include "sm8550-audio.dtsi"
 #include "pm8550.dtsi"
 #include "pm8550vs.dtsi"
 #include "pmk8550.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
index d90dc7b37c4a..98c722915d4e 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
@@ -11,6 +11,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include <dt-bindings/sound/cs35l45.h>
 #include "sm8550.dtsi"
+#include "sm8550-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #include "pm8550b.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index 45713d46f3c5..d35d2b9b438d 100644
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -20,7 +20,6 @@
 #include <dt-bindings/mailbox/qcom-ipcc.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/power/qcom,rpmhpd.h>
-#include <dt-bindings/soc/qcom,gpr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
 #include <dt-bindings/phy/phy-qcom-qmp.h>
@@ -2746,6 +2745,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
+				gpr: gpr {
+				};
+
 				fastrpc {
 					compatible = "qcom,fastrpc";
 					qcom,glink-channels = "fastrpcglink-apps-dsp";
@@ -2794,46 +2796,6 @@ compute-cb@7 {
 						dma-coherent;
 					};
 				};
-
-				gpr {
-					compatible = "qcom,gpr";
-					qcom,glink-channels = "adsp_apps";
-					qcom,domain = <GPR_DOMAIN_ID_ADSP>;
-					qcom,intents = <512 20>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					q6apm: service@1 {
-						compatible = "qcom,q6apm";
-						reg = <GPR_APM_MODULE_IID>;
-						#sound-dai-cells = <0>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6apmdai: dais {
-							compatible = "qcom,q6apm-dais";
-							iommus = <&apps_smmu 0x1001 0x80>,
-								 <&apps_smmu 0x1061 0x0>;
-						};
-
-						q6apmbedai: bedais {
-							compatible = "qcom,q6apm-lpass-dais";
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6prm: service@2 {
-						compatible = "qcom,q6prm";
-						reg = <GPR_PRM_MODULE_IID>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6prmcc: clock-controller {
-							compatible = "qcom,q6prm-lpass-clocks";
-							#clock-cells = <2>;
-						};
-					};
-				};
 			};
 		};
 
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 05/23] arm64: dts: qcom: sm8450: use dedicated audioreach dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (3 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 04/23] arm64: dts: qcom: sm8550: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 06/23] arm64: dts: qcom: sar2130p: " srinivas.kandagatla
                   ` (18 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8450-audio.dtsi    |  5 +++
 arch/arm64/boot/dts/qcom/sm8450-hdk.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8450-qrd.dts       |  1 +
 .../dts/qcom/sm8450-sony-xperia-nagara.dtsi   |  1 +
 arch/arm64/boot/dts/qcom/sm8450.dtsi          | 39 +------------------
 5 files changed, 9 insertions(+), 38 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm8450-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm8450-audio.dtsi b/arch/arm64/boot/dts/qcom/sm8450-audio.dtsi
new file mode 100644
index 000000000000..1478326594ca
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8450-audio.dtsi
@@ -0,0 +1,5 @@
+#include "audioreach-audio.dtsi"
+
+&q6apmdai{
+	iommus = <&apps_smmu 0x1801 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
index 2ff40a120aad..d528df226eea 100644
--- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
@@ -12,6 +12,7 @@
 #include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h>
 #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
 #include "sm8450.dtsi"
+#include "sm8450-audio.dtsi"
 #include "pm8350.dtsi"
 #include "pm8350b.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8450-qrd.dts b/arch/arm64/boot/dts/qcom/sm8450-qrd.dts
index 8c39fbcaad80..8b13b09d3b08 100644
--- a/arch/arm64/boot/dts/qcom/sm8450-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-qrd.dts
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8450.dtsi"
+#include "sm8450-audio.dtsi"
 #include "pm8350.dtsi"
 #include "pm8350b.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
index cc1335a07a35..fbb2d6292163 100644
--- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
@@ -6,6 +6,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8450.dtsi"
+#include "sm8450-audio.dtsi"
 #include "pm8350.dtsi"
 #include "pm8350b.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 33574ad706b9..fa0822c37854 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -21,7 +21,6 @@
 #include <dt-bindings/interconnect/qcom,icc.h>
 #include <dt-bindings/interconnect/qcom,sm8450.h>
 #include <dt-bindings/reset/qcom,sm8450-gpucc.h>
-#include <dt-bindings/soc/qcom,gpr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -2783,43 +2782,7 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
-				gpr {
-					compatible = "qcom,gpr";
-					qcom,glink-channels = "adsp_apps";
-					qcom,domain = <GPR_DOMAIN_ID_ADSP>;
-					qcom,intents = <512 20>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					q6apm: service@1 {
-						compatible = "qcom,q6apm";
-						reg = <GPR_APM_MODULE_IID>;
-						#sound-dai-cells = <0>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6apmdai: dais {
-							compatible = "qcom,q6apm-dais";
-							iommus = <&apps_smmu 0x1801 0x0>;
-						};
-
-						q6apmbedai: bedais {
-							compatible = "qcom,q6apm-lpass-dais";
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6prm: service@2 {
-						compatible = "qcom,q6prm";
-						reg = <GPR_PRM_MODULE_IID>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6prmcc: clock-controller {
-							compatible = "qcom,q6prm-lpass-clocks";
-							#clock-cells = <2>;
-						};
-					};
+				gpr: gpr {
 				};
 
 				fastrpc {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 06/23] arm64: dts: qcom: sar2130p: use dedicated audioreach dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (4 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 05/23] arm64: dts: qcom: sm8450: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 07/23] arm64: dts: qcom: sm8350: move dsp audio nodes to dedicated dts srinivas.kandagatla
                   ` (17 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi  |  5 +++
 .../arm64/boot/dts/qcom/sar2130p-qar2130p.dts |  1 +
 arch/arm64/boot/dts/qcom/sar2130p.dtsi        | 40 +------------------
 3 files changed, 7 insertions(+), 39 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi b/arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi
new file mode 100644
index 000000000000..1478326594ca
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi
@@ -0,0 +1,5 @@
+#include "audioreach-audio.dtsi"
+
+&q6apmdai{
+	iommus = <&apps_smmu 0x1801 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts b/arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts
index 74778a5b19ba..b0db8e48a13e 100644
--- a/arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts
+++ b/arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts
@@ -8,6 +8,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sar2130p.dtsi"
+#include "sar2130p-audio.dtsi"
 #include "pm8150.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sar2130p.dtsi b/arch/arm64/boot/dts/qcom/sar2130p.dtsi
index 38f7869616ff..b0f0408ec901 100644
--- a/arch/arm64/boot/dts/qcom/sar2130p.dtsi
+++ b/arch/arm64/boot/dts/qcom/sar2130p.dtsi
@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: BSD-3-Clause
 /*
  * Copyright (c) 2024, Linaro Limited
  */
@@ -17,7 +16,6 @@
 #include <dt-bindings/phy/phy-qcom-qmp.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/power/qcom,rpmhpd.h>
-#include <dt-bindings/soc/qcom,gpr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/thermal/thermal.h>
 
@@ -1622,43 +1620,7 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
-				gpr {
-					compatible = "qcom,gpr";
-					qcom,glink-channels = "adsp_apps";
-					qcom,domain = <GPR_DOMAIN_ID_ADSP>;
-					qcom,intents = <512 20>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					q6apm: service@1 {
-						compatible = "qcom,q6apm";
-						reg = <GPR_APM_MODULE_IID>;
-						#sound-dai-cells = <0>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6apmdai: dais {
-							compatible = "qcom,q6apm-dais";
-							iommus = <&apps_smmu 0x1801 0x0>;
-						};
-
-						q6apmbedai: bedais {
-							compatible = "qcom,q6apm-lpass-dais";
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6prm: service@2 {
-						compatible = "qcom,q6prm";
-						reg = <GPR_PRM_MODULE_IID>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6prmcc: clock-controller {
-							compatible = "qcom,q6prm-lpass-clocks";
-							#clock-cells = <2>;
-						};
-					};
+				gpr: gpr {
 				};
 
 				fastrpc {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 07/23] arm64: dts: qcom: sm8350: move dsp audio nodes to dedicated dts
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (5 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 06/23] arm64: dts: qcom: sar2130p: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 08/23] arm64: dts: qcom: sm8250: use dedicated elite dtsi srinivas.kandagatla
                   ` (16 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

All the device tree nodes for elite dsp are duplicated across all
the SoC dtsi files, Move this to a dedicated dtsi file so to remove some
duplication, make it consistent across all device trees and also make it
easy for new SoC's to add audio support.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/elite-audio.dtsi     | 86 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/sm8350-audio.dtsi    |  8 ++
 arch/arm64/boot/dts/qcom/sm8350-hdk.dts       |  1 +
 .../qcom/sm8350-microsoft-surface-duo2.dts    |  1 +
 arch/arm64/boot/dts/qcom/sm8350-mtp.dts       |  1 +
 .../dts/qcom/sm8350-sony-xperia-sagami.dtsi   |  1 +
 arch/arm64/boot/dts/qcom/sm8350.dtsi          | 67 +--------------
 7 files changed, 99 insertions(+), 66 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/elite-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm8350-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/elite-audio.dtsi b/arch/arm64/boot/dts/qcom/elite-audio.dtsi
new file mode 100644
index 000000000000..924ec9cc1d85
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/elite-audio.dtsi
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <dt-bindings/soc/qcom,apr.h>
+#include <dt-bindings/sound/qcom,q6asm.h>
+#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
+
+&apr {
+	compatible = "qcom,apr-v2";
+	qcom,domain = <APR_DOMAIN_ADSP>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	q6core: service@3 {
+		compatible = "qcom,q6core";
+		reg = <APR_SVC_ADSP_CORE>;
+	};
+
+	q6afe: service@4 {
+		compatible = "qcom,q6afe";
+		reg = <APR_SVC_AFE>;
+		qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
+
+		q6afedai: dais {
+			compatible = "qcom,q6afe-dais";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			#sound-dai-cells = <1>;
+		};
+
+		q6afecc: clock-controller {
+			compatible = "qcom,q6afe-clocks";
+			#clock-cells = <2>;
+		};
+
+	};
+
+	q6asm: service@7 {
+		compatible = "qcom,q6asm";
+		reg = <APR_SVC_ASM>;
+		qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
+
+		q6asmdai: dais {
+			compatible = "qcom,q6asm-dais";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			#sound-dai-cells = <1>;
+			dai@0 {
+				reg = <MSM_FRONTEND_DAI_MULTIMEDIA1>;
+			};
+
+			dai@1 {
+				reg = <MSM_FRONTEND_DAI_MULTIMEDIA2>;
+			};
+
+			dai@2 {
+				reg = <MSM_FRONTEND_DAI_MULTIMEDIA3>;
+			};
+
+			dai@3 {
+				reg = <MSM_FRONTEND_DAI_MULTIMEDIA4>;
+			};
+
+			dai@5 {
+				reg = <MSM_FRONTEND_DAI_MULTIMEDIA5>;
+			};
+
+			dai@6 {
+				reg = <MSM_FRONTEND_DAI_MULTIMEDIA6>;
+			};
+		};
+	};
+
+	q6adm: service@8 {
+		compatible = "qcom,q6adm";
+		reg = <APR_SVC_ADM>;
+		qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
+
+		q6routing: routing {
+			compatible = "qcom,q6adm-routing";
+			#sound-dai-cells = <0>;
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8350-audio.dtsi b/arch/arm64/boot/dts/qcom/sm8350-audio.dtsi
new file mode 100644
index 000000000000..4ff49550460a
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8350-audio.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
+&q6asmdai{
+	iommus = <&apps_smmu 0x1801 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
index f9de0e49fa24..eace0ada77d7 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8350.dtsi"
+#include "sm8350-audio.dtsi"
 #include "pm8350.dtsi"
 #include "pm8350b.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts b/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts
index 3bd5e57cbcda..7bb41f199de0 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8350.dtsi"
+#include "sm8350-audio.dtsi"
 #include "pm8350.dtsi"
 #include "pm8350b.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
index 8bee57f3b25a..1b17b4287f44 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8350.dtsi"
+#include "sm8350-audio.dtsi"
 #include "pm8350.dtsi"
 #include "pm8350b.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
index 7ae1eb0a7cce..43d8bbfdbbaa 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
@@ -6,6 +6,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8350.dtsi"
+#include "sm8350-audio.dtsi"
 #include "pm8350.dtsi"
 #include "pm8350b.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index 9a4207ead615..9c990e12094e 100644
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -1918,73 +1918,8 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
-				apr {
-					compatible = "qcom,apr-v2";
+				apr: apr {
 					qcom,glink-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					service@3 {
-						reg = <APR_SVC_ADSP_CORE>;
-						compatible = "qcom,q6core";
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-
-						q6afecc: clock-controller {
-							compatible = "qcom,q6afe-clocks";
-							#clock-cells = <2>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							iommus = <&apps_smmu 0x1801 0x0>;
-
-							dai@0 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA1>;
-							};
-
-							dai@1 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA2>;
-							};
-
-							dai@2 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA3>;
-							};
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 
 				fastrpc {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 08/23] arm64: dts: qcom: sm8250: use dedicated elite dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (6 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 07/23] arm64: dts: qcom: sm8350: move dsp audio nodes to dedicated dts srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 09/23] arm64: dts: qcom: sm6115: " srinivas.kandagatla
                   ` (15 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dts      |  1 +
 arch/arm64/boot/dts/qcom/sm8250-audio.dtsi    |  8 +++
 arch/arm64/boot/dts/qcom/sm8250-hdk.dts       |  1 +
 arch/arm64/boot/dts/qcom/sm8250-mtp.dts       |  1 +
 .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi |  1 +
 .../dts/qcom/sm8250-xiaomi-elish-common.dtsi  |  1 +
 .../boot/dts/qcom/sm8250-xiaomi-pipa.dts      |  1 +
 arch/arm64/boot/dts/qcom/sm8250.dtsi          | 53 +------------------
 8 files changed, 15 insertions(+), 52 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm8250-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 33ecbc81997c..71f0fb36a96e 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -11,6 +11,7 @@
 #include <dt-bindings/sound/qcom,q6asm.h>
 #include <dt-bindings/usb/pd.h>
 #include "sm8250.dtsi"
+#include "sm8250-audio.dtsi"
 #include "pm8150.dtsi"
 #include "pm8150b.dtsi"
 #include "pm8150l.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8250-audio.dtsi b/arch/arm64/boot/dts/qcom/sm8250-audio.dtsi
new file mode 100644
index 000000000000..4ff49550460a
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8250-audio.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
+&q6asmdai{
+	iommus = <&apps_smmu 0x1801 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
index f5c193c6c5f9..3499ea6576ed 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-hdk.dts
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8250.dtsi"
+#include "sm8250-audio.dtsi"
 #include "pm8150.dtsi"
 #include "pm8150b.dtsi"
 #include "pm8150l.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 7f592bd30248..277a89261a79 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -10,6 +10,7 @@
 #include <dt-bindings/sound/qcom,q6asm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "sm8250.dtsi"
+#include "sm8250-audio.dtsi"
 #include "pm8150.dtsi"
 #include "pm8150b.dtsi"
 #include "pm8150l.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
index d8289b2698f3..6570946fd9ef 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8250.dtsi"
+#include "sm8250-audio.dtsi"
 #include "pm8150.dtsi"
 #include "pm8150b.dtsi"
 #include "pm8150l.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index 465fd6e954a3..b239732b09d8 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include <dt-bindings/usb/pd.h>
 #include "sm8250.dtsi"
+#include "sm8250-audio.dtsi"
 #include "pm8150.dtsi"
 #include "pm8150b.dtsi"
 #include "pm8150l.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
index 668078ea4f04..d6688616fb4a 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
@@ -9,6 +9,7 @@
 #include <dt-bindings/phy/phy.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8250.dtsi"
+#include "sm8250-audio.dtsi"
 #include "pm8150.dtsi"
 #include "pm8150b.dtsi"
 #include "pm8150l.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index b0197602c677..74ea5e2d8279 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -17,7 +17,6 @@
 #include <dt-bindings/phy/phy-qcom-qmp.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/power/qcom,rpmhpd.h>
-#include <dt-bindings/soc/qcom,apr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -5999,58 +5998,8 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
-				apr {
-					compatible = "qcom,apr-v2";
+				apr: apr {
 					qcom,glink-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					service@3 {
-						reg = <APR_SVC_ADSP_CORE>;
-						compatible = "qcom,q6core";
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-
-						q6afecc: clock-controller {
-							compatible = "qcom,q6afe-clocks";
-							#clock-cells = <2>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							iommus = <&apps_smmu 0x1801 0x0>;
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 
 				fastrpc {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 09/23] arm64: dts: qcom: sm6115: use dedicated elite dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (7 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 08/23] arm64: dts: qcom: sm8250: use dedicated elite dtsi srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 10/23] arm64: dts: qcom: sdm845: use dedicated elite-audio dtsi srinivas.kandagatla
                   ` (14 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm4250.dtsi          |  1 +
 arch/arm64/boot/dts/qcom/sm6115-audio.dtsi    |  8 +++
 .../boot/dts/qcom/sm6115-fxtec-pro1x.dts      |  1 +
 arch/arm64/boot/dts/qcom/sm6115.dtsi          | 69 +------------------
 .../boot/dts/qcom/sm6115p-lenovo-j606f.dts    |  1 +
 5 files changed, 12 insertions(+), 68 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm6115-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm4250.dtsi b/arch/arm64/boot/dts/qcom/sm4250.dtsi
index cd8c8e59976e..64ff6f2f1c23 100644
--- a/arch/arm64/boot/dts/qcom/sm4250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm4250.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include "sm6115.dtsi"
+#include "sm6115-audio.dtsi"
 
 &cpu0 {
 	compatible = "qcom,kryo240";
diff --git a/arch/arm64/boot/dts/qcom/sm6115-audio.dtsi b/arch/arm64/boot/dts/qcom/sm6115-audio.dtsi
new file mode 100644
index 000000000000..d8f32f533609
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm6115-audio.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
+&q6asmdai{
+	iommus = <&apps_smmu 0x1c1 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
index ad347ccd1975..e74423bd8913 100644
--- a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "sm6115.dtsi"
+#include "sm6115-audio.dtsi"
 #include "pm6125.dtsi"
 #include "pmi632.dtsi"
 #include <dt-bindings/arm/qcom,ids.h>
diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index 91fc36b59abf..b0ff09aca6d5 100644
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -15,7 +15,6 @@
 #include <dt-bindings/interconnect/qcom,sm6115.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
-#include <dt-bindings/soc/qcom,apr.h>
 #include <dt-bindings/sound/qcom,q6asm.h>
 #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -2729,74 +2728,8 @@ glink-edge {
 				qcom,remote-pid = <2>;
 				mboxes = <&apcs_glb 8>;
 
-				apr {
-					compatible = "qcom,apr-v2";
+				apr: apr {
 					qcom,glink-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					service@3 {
-						reg = <APR_SVC_ADSP_CORE>;
-						compatible = "qcom,q6core";
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-
-						q6afecc: clock-controller {
-							compatible = "qcom,q6afe-clocks";
-							#clock-cells = <2>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							iommus = <&apps_smmu 0x1c1 0x0>;
-
-							dai@0 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA1>;
-							};
-
-							dai@1 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA2>;
-							};
-
-							dai@2 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA3>;
-							};
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 
 				fastrpc {
diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
index c17545111f49..b461a09781d5 100644
--- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "sm6115.dtsi"
+#include "sm6115-audio.dtsi"
 #include "pm6125.dtsi"
 
 / {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 10/23] arm64: dts: qcom: sdm845: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (8 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 09/23] arm64: dts: qcom: sm6115: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 11/23] arm64: dts: qcom: sdm630: " srinivas.kandagatla
                   ` (13 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sdm845-audio.dtsi    |  8 +++
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi    |  1 +
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts    |  1 +
 .../arm64/boot/dts/qcom/sdm845-lg-common.dtsi |  1 +
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts       |  1 +
 .../boot/dts/qcom/sdm845-oneplus-common.dtsi  |  1 +
 .../dts/qcom/sdm845-samsung-starqltechn.dts   |  1 +
 .../boot/dts/qcom/sdm845-shift-axolotl.dts    |  1 +
 .../dts/qcom/sdm845-sony-xperia-tama.dtsi     |  1 +
 .../qcom/sdm845-xiaomi-beryllium-common.dtsi  |  1 +
 .../boot/dts/qcom/sdm845-xiaomi-polaris.dts   |  1 +
 arch/arm64/boot/dts/qcom/sdm845.dtsi          | 49 +------------------
 arch/arm64/boot/dts/qcom/sdm850.dtsi          |  1 +
 13 files changed, 20 insertions(+), 48 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sdm845-audio.dtsi b/arch/arm64/boot/dts/qcom/sdm845-audio.dtsi
new file mode 100644
index 000000000000..112da7e4e04a
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sdm845-audio.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
+&q6asmdai{
+	iommus = <&apps_smmu 0x1821 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index b7e514f81f92..4214210d38d6 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 
 /* PMICs depend on spmi_bus label and so must come after SoC */
 #include "pm8005.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index b5c63fa0365d..20dae8a0d0ce 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -11,6 +11,7 @@
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <dt-bindings/sound/qcom,q6asm.h>
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "sdm845-wcd9340.dtsi"
 #include "pm8998.dtsi"
 #include "pmi8998.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
index 99dafc6716e7..36bcaaa0f5b0 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -10,6 +10,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "pm8998.dtsi"
 #include "pmi8998.dtsi"
 
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index a98756e8b965..0a06f1a45978 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -9,6 +9,7 @@
 
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "pm8998.dtsi"
 #include "pmi8998.dtsi"
 
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index b118d666e535..88729fa88f8a 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -14,6 +14,7 @@
 #include <dt-bindings/sound/qcom,q6asm.h>
 
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "sdm845-wcd9340.dtsi"
 #include "pm8998.dtsi"
 #include "pmi8998.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
index d686531bf4ea..160066c89fce 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
@@ -16,6 +16,7 @@
 #include <dt-bindings/sound/qcom,wcd934x.h>
 
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "pm8998.dtsi"
 #include "sdm845-wcd9340.dtsi"
 
diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index 2cf7b5e1243c..824947d8f2e4 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -11,6 +11,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "pm8998.dtsi"
 #include "pmi8998.dtsi"
 
diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index a3a304e1ac87..20ef0f1e18b5 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -7,6 +7,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "pm8005.dtsi"
 #include "pm8998.dtsi"
 #include "pmi8998.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 7810b0ce7591..b27d6ded9d35 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <dt-bindings/sound/qcom,q6asm.h>
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "sdm845-wcd9340.dtsi"
 #include "pm8998.dtsi"
 #include "pmi8998.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 63cf879a7a29..c7d3e68cae39 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -13,6 +13,7 @@
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <dt-bindings/sound/qcom,q6asm.h>
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 #include "sdm845-wcd9340.dtsi"
 #include "pm8998.dtsi"
 #include "pmi8998.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 828b55cb6baf..42638f47e9a1 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -25,7 +25,6 @@
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/reset/qcom,sdm845-aoss.h>
 #include <dt-bindings/reset/qcom,sdm845-pdc.h>
-#include <dt-bindings/soc/qcom,apr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/clock/qcom,gcc-sdm845.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -928,54 +927,8 @@ glink-edge {
 			qcom,remote-pid = <2>;
 			mboxes = <&apss_shared 8>;
 
-			apr {
-				compatible = "qcom,apr-v2";
+			apr: apr {
 				qcom,glink-channels = "apr_audio_svc";
-				qcom,domain = <APR_DOMAIN_ADSP>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				qcom,intents = <512 20>;
-
-				service@3 {
-					reg = <APR_SVC_ADSP_CORE>;
-					compatible = "qcom,q6core";
-					qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-				};
-
-				q6afe: service@4 {
-					compatible = "qcom,q6afe";
-					reg = <APR_SVC_AFE>;
-					qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-					q6afedai: dais {
-						compatible = "qcom,q6afe-dais";
-						#address-cells = <1>;
-						#size-cells = <0>;
-						#sound-dai-cells = <1>;
-					};
-				};
-
-				q6asm: service@7 {
-					compatible = "qcom,q6asm";
-					reg = <APR_SVC_ASM>;
-					qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-					q6asmdai: dais {
-						compatible = "qcom,q6asm-dais";
-						#address-cells = <1>;
-						#size-cells = <0>;
-						#sound-dai-cells = <1>;
-						iommus = <&apps_smmu 0x1821 0x0>;
-					};
-				};
-
-				q6adm: service@8 {
-					compatible = "qcom,q6adm";
-					reg = <APR_SVC_ADM>;
-					qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-					q6routing: routing {
-						compatible = "qcom,q6adm-routing";
-						#sound-dai-cells = <0>;
-					};
-				};
 			};
 
 			fastrpc {
diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi
index da9f6fbe32f6..65fbcc644de6 100644
--- a/arch/arm64/boot/dts/qcom/sdm850.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi
@@ -6,6 +6,7 @@
  */
 
 #include "sdm845.dtsi"
+#include "sdm845-audio.dtsi"
 
 &cpu4_opp_table {
 	cpu4_opp33: opp-2841600000 {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 11/23] arm64: dts: qcom: sdm630: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (9 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 10/23] arm64: dts: qcom: sdm845: use dedicated elite-audio dtsi srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 12/23] arm64: dts: qcom: sc7280: " srinivas.kandagatla
                   ` (12 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sdm630-audio.dtsi    |  8 ++++
 .../qcom/sdm630-sony-xperia-ganges-kirin.dts  |  1 +
 .../sdm630-sony-xperia-nile-discovery.dts     |  1 +
 .../qcom/sdm630-sony-xperia-nile-pioneer.dts  |  1 +
 .../qcom/sdm630-sony-xperia-nile-voyager.dts  |  1 +
 arch/arm64/boot/dts/qcom/sdm630.dtsi          | 45 +------------------
 6 files changed, 14 insertions(+), 43 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sdm630-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sdm630-audio.dtsi b/arch/arm64/boot/dts/qcom/sdm630-audio.dtsi
new file mode 100644
index 000000000000..ca7af09a2380
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sdm630-audio.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
+&q6asmdai{
+	iommus = <&lpass_smmu 1>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
index 9425b2d9536e..91663a502291 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "sdm630.dtsi"
+#include "sdm630-audio.dtsi"
 #include "sdm630-sony-xperia-nile.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts
index dd484a9bc7cd..cc0d16ea16f5 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "sdm630.dtsi"
+#include "sdm630-audio.dtsi"
 #include "sdm630-sony-xperia-nile.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts
index 2da83cd41187..9cc953b89816 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "sdm630.dtsi"
+#include "sdm630-audio.dtsi"
 #include "sdm630-sony-xperia-nile.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts
index a679d4acee29..f6d31ef8b49f 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "sdm630.dtsi"
+#include "sdm630-audio.dtsi"
 #include "sdm630-sony-xperia-nile.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 8b1a45a4e56e..300e69b86cfa 100644
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -15,7 +15,6 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/thermal/thermal.h>
-#include <dt-bindings/soc/qcom,apr.h>
 
 / {
 	interrupt-parent = <&intc>;
@@ -2293,50 +2292,10 @@ glink-edge {
 				mboxes = <&apcs_glb 9>;
 				qcom,remote-pid = <2>;
 
-				apr {
-					compatible = "qcom,apr-v2";
+				apr: apr {
 					qcom,glink-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					service@3 {
-						reg = <APR_SVC_ADSP_CORE>;
-						compatible = "qcom,q6core";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							iommus = <&lpass_smmu 1>;
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
+
 			};
 		};
 
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 12/23] arm64: dts: qcom: sc7280: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (10 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 11/23] arm64: dts: qcom: sdm630: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-24  7:34   ` Stephan Gerhold
  2025-07-23 22:27 ` [PATCH 13/23] arm64: dts: qcom: sc7180: " srinivas.kandagatla
                   ` (11 subsequent siblings)
  23 siblings, 1 reply; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 .../boot/dts/qcom/qcm6490-fairphone-fp5.dts   |  1 +
 arch/arm64/boot/dts/qcom/qcm6490-idp.dts      |  1 +
 .../boot/dts/qcom/qcm6490-shift-otter.dts     |  1 +
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts  |  1 +
 arch/arm64/boot/dts/qcom/sc7280-audio.dtsi    |  8 +++
 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi      |  1 +
 arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi    |  1 +
 arch/arm64/boot/dts/qcom/sc7280.dtsi          | 68 +------------------
 arch/arm64/boot/dts/qcom/sm7325.dtsi          |  1 +
 9 files changed, 16 insertions(+), 67 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7280-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
index e115b6a52b29..ce578c1fe3d7 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
@@ -17,6 +17,7 @@
 #include <dt-bindings/sound/qcom,q6asm.h>
 #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
 #include "sc7280.dtsi"
+#include "sc7280-audio.dtsi"
 #include "pm7250b.dtsi"
 #include "pm7325.dtsi"
 #include "pm8350c.dtsi" /* PM7350C */
diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
index 7a155ef6492e..6932ca1c831d 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
@@ -14,6 +14,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sc7280.dtsi"
+#include "sc7280-audio.dtsi"
 #include "pm7250b.dtsi"
 #include "pm7325.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
index b9a0f7ac4d9c..92a0bf46cc5f 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
@@ -15,6 +15,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sc7280.dtsi"
+#include "sc7280-audio.dtsi"
 #include "pm7250b.dtsi"
 #include "pm7325.dtsi"
 #include "pm8350c.dtsi" /* PM7350C */
diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 5fbcd48f2e2d..8b4717ba0be5 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -15,6 +15,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sc7280.dtsi"
+#include "sc7280-audio.dtsi"
 #include "pm7250b.dtsi"
 #include "pm7325.dtsi"
 #include "pm8350c.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7280-audio.dtsi b/arch/arm64/boot/dts/qcom/sc7280-audio.dtsi
new file mode 100644
index 000000000000..4ff49550460a
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-audio.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
+&q6asmdai{
+	iommus = <&apps_smmu 0x1801 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index 90e5b9ab5b84..ac39fd8fec87 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h>
 #include <dt-bindings/input/linux-event-codes.h>
 #include "sc7280.dtsi"
+#include "sc7280-audio.dtsi"
 #include "pm7325.dtsi"
 #include "pm8350c.dtsi"
 #include "pmk8350.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
index 7d1d5bbbbbd9..c9618ae5b219 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
@@ -17,6 +17,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "sc7280.dtsi"
+#include "sc7280-audio.dtsi"
 
 /* PMICs depend on spmi_bus label and so must come after SoC */
 #include "pm7325.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 64a2abd30100..428832e918e6 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -25,7 +25,6 @@
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/reset/qcom,sdm845-aoss.h>
 #include <dt-bindings/reset/qcom,sdm845-pdc.h>
-#include <dt-bindings/soc/qcom,apr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/sound/qcom,lpass.h>
 #include <dt-bindings/sound/qcom,q6asm.h>
@@ -3833,73 +3832,8 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
-				apr {
-					compatible = "qcom,apr-v2";
+				apr: apr {
 					qcom,glink-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					service@3 {
-						reg = <APR_SVC_ADSP_CORE>;
-						compatible = "qcom,q6core";
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-
-						q6afecc: clock-controller {
-							compatible = "qcom,q6afe-clocks";
-							#clock-cells = <2>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							iommus = <&apps_smmu 0x1801 0x0>;
-
-							dai@0 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA1>;
-							};
-
-							dai@1 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA2>;
-							};
-
-							dai@2 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA3>;
-							};
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 
 				fastrpc {
diff --git a/arch/arm64/boot/dts/qcom/sm7325.dtsi b/arch/arm64/boot/dts/qcom/sm7325.dtsi
index 85d34b53e5e9..b4226183cb44 100644
--- a/arch/arm64/boot/dts/qcom/sm7325.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm7325.dtsi
@@ -5,6 +5,7 @@
  */
 
 #include "sc7280.dtsi"
+#include "sc7280-audio.dtsi"
 
 /* SM7325 uses Kryo 670 */
 &cpu0 { compatible = "qcom,kryo670"; };
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 12/23] arm64: dts: qcom: sc7280: use dedicated elite-audio dtsi
  2025-07-23 22:27 ` [PATCH 12/23] arm64: dts: qcom: sc7280: " srinivas.kandagatla
@ 2025-07-24  7:34   ` Stephan Gerhold
  0 siblings, 0 replies; 39+ messages in thread
From: Stephan Gerhold @ 2025-07-24  7:34 UTC (permalink / raw)
  To: srinivas.kandagatla
  Cc: andersson, konradybcio, robh, krzk+dt, conor+dt,
	cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On Wed, Jul 23, 2025 at 11:27:26PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
> This move removes duplication.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>  .../boot/dts/qcom/qcm6490-fairphone-fp5.dts   |  1 +
>  arch/arm64/boot/dts/qcom/qcm6490-idp.dts      |  1 +
>  .../boot/dts/qcom/qcm6490-shift-otter.dts     |  1 +
>  arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts  |  1 +
>  arch/arm64/boot/dts/qcom/sc7280-audio.dtsi    |  8 +++
>  arch/arm64/boot/dts/qcom/sc7280-idp.dtsi      |  1 +
>  arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi    |  1 +
>  arch/arm64/boot/dts/qcom/sc7280.dtsi          | 68 +------------------
>  arch/arm64/boot/dts/qcom/sm7325.dtsi          |  1 +
>  9 files changed, 16 insertions(+), 67 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7280-audio.dtsi
> 
> [...]
> diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> index 5fbcd48f2e2d..8b4717ba0be5 100644
> --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
> @@ -15,6 +15,7 @@
>  #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>  #include "sc7280.dtsi"
> +#include "sc7280-audio.dtsi"

^

>  #include "pm7250b.dtsi"
>  #include "pm7325.dtsi"
>  #include "pm8350c.dtsi"
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-audio.dtsi b/arch/arm64/boot/dts/qcom/sc7280-audio.dtsi
> new file mode 100644
> index 000000000000..4ff49550460a
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-audio.dtsi
> @@ -0,0 +1,8 @@
> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +#include "elite-audio.dtsi"
> +&q6asmdai{
> +	iommus = <&apps_smmu 0x1801 0x0>;
> +};

As far as I understand, RB3Gen2 uses AudioReach [1], so we shouldn't
have an Elite-based "sc7280-audio.dtsi" included in all boards. In this
case, I think we need separate sc7280-audio-elite.dtsi and
sc7280-audio-audioreach.dtsi and include what is relevant for the board.

[1]: https://lore.kernel.org/linux-arm-msm/20250720173215.3075576-1-quic_pkumpatl@quicinc.com/T/

Thanks,
Stephan

^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 13/23] arm64: dts: qcom: sc7180: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (11 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 12/23] arm64: dts: qcom: sc7280: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-24  7:38   ` Stephan Gerhold
  2025-07-23 22:27 ` [PATCH 14/23] arm64: dts: qcom: sm8750: use dedicated audioreach dtsi srinivas.kandagatla
                   ` (10 subsequent siblings)
  23 siblings, 1 reply; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 .../boot/dts/qcom/sc7180-acer-aspire1.dts     |  1 +
 arch/arm64/boot/dts/qcom/sc7180-audio.dtsi    |  8 +++
 arch/arm64/boot/dts/qcom/sc7180-idp.dts       |  1 +
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  |  1 +
 arch/arm64/boot/dts/qcom/sc7180.dtsi          | 56 +------------------
 arch/arm64/boot/dts/qcom/sm7125.dtsi          |  1 +
 6 files changed, 13 insertions(+), 55 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7180-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
index 672ac4c3afa3..70b8633e5dd9 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
@@ -7,6 +7,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "sc7180.dtsi"
+#include "sc7180-audio.dtsi"
 
 #include "pm6150.dtsi"
 #include "pm6150l.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi b/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
new file mode 100644
index 000000000000..d6d41ba93195
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
+&q6asmdai{
+	iommus = <&apps_smmu 0x1001 0x0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index 0146fb0036d4..cbc3a3096cb2 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -11,6 +11,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include "sc7180.dtsi"
+#include "sc7180-audio.dtsi"
 #include "sc7180-firmware-tfa.dtsi"
 #include "pm6150.dtsi"
 #include "pm6150l.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 74ab321d3333..0e267b9fdefc 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -13,6 +13,7 @@
 #include <dt-bindings/sound/sc7180-lpass.h>
 
 #include "sc7180.dtsi"
+#include "sc7180-audio.dtsi"
 #include "sc7180-firmware-tfa.dtsi"
 /* PMICs depend on spmi_bus label and so must come after sc7180.dtsi */
 #include "pm6150.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 8f827f1d8515..b56173838fdd 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -23,7 +23,6 @@
 #include <dt-bindings/reset/qcom,sdm845-aoss.h>
 #include <dt-bindings/reset/qcom,sdm845-pdc.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
-#include <dt-bindings/soc/qcom,apr.h>
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <dt-bindings/thermal/thermal.h>
 
@@ -3876,61 +3875,8 @@ glink-edge {
 				qcom,remote-pid = <2>;
 				mboxes = <&apss_shared 8>;
 
-				apr {
-					compatible = "qcom,apr-v2";
+				apr: apr {
 					qcom,glink-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					service@3 {
-						compatible = "qcom,q6core";
-						reg = <APR_SVC_ADSP_CORE>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-
-						q6afecc: clock-controller {
-							compatible = "qcom,q6afe-clocks";
-							#clock-cells = <2>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							iommus = <&apps_smmu 0x1001 0x0>;
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 
 				fastrpc {
diff --git a/arch/arm64/boot/dts/qcom/sm7125.dtsi b/arch/arm64/boot/dts/qcom/sm7125.dtsi
index a53145a610a3..567c2cdde916 100644
--- a/arch/arm64/boot/dts/qcom/sm7125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm7125.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include "sc7180.dtsi"
+#include "sc7180-audio.dtsi"
 
 /* SM7125 uses Kryo 465 instead of Kryo 468 */
 &cpu0 { compatible = "qcom,kryo465"; };
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 13/23] arm64: dts: qcom: sc7180: use dedicated elite-audio dtsi
  2025-07-23 22:27 ` [PATCH 13/23] arm64: dts: qcom: sc7180: " srinivas.kandagatla
@ 2025-07-24  7:38   ` Stephan Gerhold
  2025-07-24 10:41     ` Srinivas Kandagatla
  0 siblings, 1 reply; 39+ messages in thread
From: Stephan Gerhold @ 2025-07-24  7:38 UTC (permalink / raw)
  To: srinivas.kandagatla
  Cc: andersson, konradybcio, robh, krzk+dt, conor+dt,
	cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On Wed, Jul 23, 2025 at 11:27:27PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
> This move removes duplication.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>  .../boot/dts/qcom/sc7180-acer-aspire1.dts     |  1 +
>  arch/arm64/boot/dts/qcom/sc7180-audio.dtsi    |  8 +++
>  arch/arm64/boot/dts/qcom/sc7180-idp.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  |  1 +
>  arch/arm64/boot/dts/qcom/sc7180.dtsi          | 56 +------------------
>  arch/arm64/boot/dts/qcom/sm7125.dtsi          |  1 +
>  6 files changed, 13 insertions(+), 55 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
> 
> [...]
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi b/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
> new file mode 100644
> index 000000000000..d6d41ba93195
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
> @@ -0,0 +1,8 @@
> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +#include "elite-audio.dtsi"
> +&q6asmdai{
> +	iommus = <&apps_smmu 0x1001 0x0>;
> +};
> [...]
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> index 74ab321d3333..0e267b9fdefc 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -13,6 +13,7 @@
>  #include <dt-bindings/sound/sc7180-lpass.h>
>  
>  #include "sc7180.dtsi"
> +#include "sc7180-audio.dtsi"
>  #include "sc7180-firmware-tfa.dtsi"
>  /* PMICs depend on spmi_bus label and so must come after sc7180.dtsi */
>  #include "pm6150.dtsi"

ChromeOS on SC7180 uses ADSP bypass, so explicitly including
elite-audio.dtsi for Trogdor is a bit unexpected. It doesn't use those
nodes at all.

Thanks,
Stephan

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: [PATCH 13/23] arm64: dts: qcom: sc7180: use dedicated elite-audio dtsi
  2025-07-24  7:38   ` Stephan Gerhold
@ 2025-07-24 10:41     ` Srinivas Kandagatla
  0 siblings, 0 replies; 39+ messages in thread
From: Srinivas Kandagatla @ 2025-07-24 10:41 UTC (permalink / raw)
  To: Stephan Gerhold
  Cc: andersson, konradybcio, robh, krzk+dt, conor+dt,
	cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On 7/24/25 8:38 AM, Stephan Gerhold wrote:
> On Wed, Jul 23, 2025 at 11:27:27PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
>> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
>>
>> Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
>> This move removes duplication.
>>
>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
>> ---
>>  .../boot/dts/qcom/sc7180-acer-aspire1.dts     |  1 +
>>  arch/arm64/boot/dts/qcom/sc7180-audio.dtsi    |  8 +++
>>  arch/arm64/boot/dts/qcom/sc7180-idp.dts       |  1 +
>>  arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  |  1 +
>>  arch/arm64/boot/dts/qcom/sc7180.dtsi          | 56 +------------------
>>  arch/arm64/boot/dts/qcom/sm7125.dtsi          |  1 +
>>  6 files changed, 13 insertions(+), 55 deletions(-)
>>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
>>
>> [...]
>> diff --git a/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi b/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
>> new file mode 100644
>> index 000000000000..d6d41ba93195
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
>> @@ -0,0 +1,8 @@
>> +// SPDX-License-Identifier: BSD-3-Clause
>> +/*
>> + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
>> + */
>> +#include "elite-audio.dtsi"
>> +&q6asmdai{
>> +	iommus = <&apps_smmu 0x1001 0x0>;
>> +};
>> [...]
>> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
>> index 74ab321d3333..0e267b9fdefc 100644
>> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
>> @@ -13,6 +13,7 @@
>>  #include <dt-bindings/sound/sc7180-lpass.h>
>>  
>>  #include "sc7180.dtsi"
>> +#include "sc7180-audio.dtsi"
>>  #include "sc7180-firmware-tfa.dtsi"
>>  /* PMICs depend on spmi_bus label and so must come after sc7180.dtsi */
>>  #include "pm6150.dtsi"
> 
> ChromeOS on SC7180 uses ADSP bypass, so explicitly including
> elite-audio.dtsi for Trogdor is a bit unexpected. It doesn't use those
> nodes at all.
From DT PoV nothing changed, its same as before, for ADSP bypass the DSP
services will never be up.


--srini
> 
> Thanks,
> Stephan


^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 14/23] arm64: dts: qcom: sm8750: use dedicated audioreach dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (12 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 13/23] arm64: dts: qcom: sc7180: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 15/23] arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi srinivas.kandagatla
                   ` (9 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8750-audio.dtsi | 10 ++++++
 arch/arm64/boot/dts/qcom/sm8750-mtp.dts    |  1 +
 arch/arm64/boot/dts/qcom/sm8750-qrd.dts    |  1 +
 arch/arm64/boot/dts/qcom/sm8750.dtsi       | 41 +---------------------
 4 files changed, 13 insertions(+), 40 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm8750-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm8750-audio.dtsi b/arch/arm64/boot/dts/qcom/sm8750-audio.dtsi
new file mode 100644
index 000000000000..54eab4f5e029
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8750-audio.dtsi
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "audioreach-audio.dtsi"
+
+&q6apmdai{
+	iommus = <&apps_smmu 0x1001 0x80>,
+		 <&apps_smmu 0x1041 0x20>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
index 75cfbb510be5..eeca98dc6204 100644
--- a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts
@@ -9,6 +9,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8750.dtsi"
+#include "sm8750-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #define PMK8550VE_SID 8
diff --git a/arch/arm64/boot/dts/qcom/sm8750-qrd.dts b/arch/arm64/boot/dts/qcom/sm8750-qrd.dts
index 13c7b9664c89..83cb53b64f0c 100644
--- a/arch/arm64/boot/dts/qcom/sm8750-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8750-qrd.dts
@@ -9,6 +9,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm8750.dtsi"
+#include "sm8750-audio.dtsi"
 #include "pm8010.dtsi"
 #include "pm8550.dtsi"
 #define PMK8550VE_SID 8
diff --git a/arch/arm64/boot/dts/qcom/sm8750.dtsi b/arch/arm64/boot/dts/qcom/sm8750.dtsi
index 79ca262f5811..952f6cfcdccf 100644
--- a/arch/arm64/boot/dts/qcom/sm8750.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8750.dtsi
@@ -14,7 +14,6 @@
 #include <dt-bindings/mailbox/qcom-ipcc.h>
 #include <dt-bindings/power/qcom,rpmhpd.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
-#include <dt-bindings/soc/qcom,gpr.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
 
@@ -2194,45 +2193,7 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 						IPCC_MPROC_SIGNAL_GLINK_QMP>;
 				qcom,remote-pid = <2>;
 				label = "lpass";
-
-				gpr {
-					compatible = "qcom,gpr";
-					qcom,glink-channels = "adsp_apps";
-					qcom,domain = <GPR_DOMAIN_ID_ADSP>;
-					qcom,intents = <512 20>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					q6apm: service@1 {
-						compatible = "qcom,q6apm";
-						reg = <GPR_APM_MODULE_IID>;
-						#sound-dai-cells = <0>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6apmbedai: bedais {
-							compatible = "qcom,q6apm-lpass-dais";
-							#sound-dai-cells = <1>;
-						};
-
-						q6apmdai: dais {
-							compatible = "qcom,q6apm-dais";
-							iommus = <&apps_smmu 0x1001 0x80>,
-								 <&apps_smmu 0x1041 0x20>;
-						};
-					};
-
-					q6prm: service@2 {
-						compatible = "qcom,q6prm";
-						reg = <GPR_PRM_MODULE_IID>;
-						qcom,protection-domain = "avs/audio",
-									 "msm/adsp/audio_pd";
-
-						q6prmcc: clock-controller {
-							compatible = "qcom,q6prm-lpass-clocks";
-							#clock-cells = <2>;
-						};
-					};
+				gpr: gpr {
 				};
 			};
 		};
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 15/23] arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (13 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 14/23] arm64: dts: qcom: sm8750: use dedicated audioreach dtsi srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-24  7:42   ` Stephan Gerhold
  2025-07-23 22:27 ` [PATCH 16/23] arm64: dts: qcom: msm8939: " srinivas.kandagatla
                   ` (8 subsequent siblings)
  23 siblings, 1 reply; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/msm8916-audio.dtsi  |  5 +++
 arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi |  1 +
 arch/arm64/boot/dts/qcom/msm8916.dtsi        | 44 --------------------
 3 files changed, 6 insertions(+), 44 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/msm8916-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/msm8916-audio.dtsi b/arch/arm64/boot/dts/qcom/msm8916-audio.dtsi
new file mode 100644
index 000000000000..fe17bc28e825
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8916-audio.dtsi
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
index b1a7eafbee31..c0a48692c100 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
@@ -9,6 +9,7 @@
  */
 
 #include "msm8916.dtsi"
+#include "msm8916-audio.dtsi"
 #include "pm8916.dtsi"
 
 &camss {
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index b50c7e6e0bfc..6d9807adc618 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1997,51 +1997,7 @@ smd-edge {
 				label = "hexagon";
 
 				apr: apr {
-					compatible = "qcom,apr-v2";
 					qcom,smd-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-					status = "disabled";
-
-					q6core: service@3 {
-						compatible = "qcom,q6core";
-						reg = <APR_SVC_ADSP_CORE>;
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 
 				fastrpc {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 15/23] arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi
  2025-07-23 22:27 ` [PATCH 15/23] arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi srinivas.kandagatla
@ 2025-07-24  7:42   ` Stephan Gerhold
  0 siblings, 0 replies; 39+ messages in thread
From: Stephan Gerhold @ 2025-07-24  7:42 UTC (permalink / raw)
  To: srinivas.kandagatla
  Cc: andersson, konradybcio, robh, krzk+dt, conor+dt,
	cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On Wed, Jul 23, 2025 at 11:27:29PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
> This move removes duplication.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>  arch/arm64/boot/dts/qcom/msm8916-audio.dtsi  |  5 +++
>  arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi |  1 +
>  arch/arm64/boot/dts/qcom/msm8916.dtsi        | 44 --------------------
>  3 files changed, 6 insertions(+), 44 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/msm8916-audio.dtsi
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-audio.dtsi b/arch/arm64/boot/dts/qcom/msm8916-audio.dtsi
> new file mode 100644
> index 000000000000..fe17bc28e825
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/msm8916-audio.dtsi
> @@ -0,0 +1,5 @@
> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +#include "elite-audio.dtsi"

I don't think this will work. elite-audio.dtsi contains

	qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

for all the APR service nodes, but the ADSP firmware on MSM8916 doesn't
have support for this as far as I know. This will likely prevent all the
drivers from probing.

The definition below doesn't use "qcom,protection-domain".

> diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
> index b1a7eafbee31..c0a48692c100 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
> @@ -9,6 +9,7 @@
>   */
>  
>  #include "msm8916.dtsi"
> +#include "msm8916-audio.dtsi"
>  #include "pm8916.dtsi"
>  
>  &camss {
> diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> index b50c7e6e0bfc..6d9807adc618 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> @@ -1997,51 +1997,7 @@ smd-edge {
>  				label = "hexagon";
>  
>  				apr: apr {
> -					compatible = "qcom,apr-v2";
>  					qcom,smd-channels = "apr_audio_svc";
> -					qcom,domain = <APR_DOMAIN_ADSP>;
> -					#address-cells = <1>;
> -					#size-cells = <0>;
> -					status = "disabled";

status = "disabled" got lost in the conversion. This is needed on DB410c
to prevent crashes when probing the broken APR services in the GPS-only
ADSP firmware.

Instead of disabling APR by default, you could move the status =
"disabled" to apq8016-sbc. I think that would also be fine.

Thanks,
Stephan

^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 16/23] arm64: dts: qcom: msm8939: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (14 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 15/23] arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 17/23] arm64: dts: qcom: msm8996: " srinivas.kandagatla
                   ` (7 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/apq8039-t2.dts       |  1 +
 arch/arm64/boot/dts/qcom/msm8939-audio.dtsi   |  5 +++
 arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi  |  1 +
 .../qcom/msm8939-sony-xperia-kanuti-tulip.dts |  1 +
 arch/arm64/boot/dts/qcom/msm8939.dtsi         | 44 -------------------
 5 files changed, 8 insertions(+), 44 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/msm8939-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
index 38c281f0fe65..1d1bd9273325 100644
--- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts
+++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "msm8939.dtsi"
+#include "msm8939-audio.dtsi"
 #include "msm8939-pm8916.dtsi"
 #include <dt-bindings/arm/qcom,ids.h>
 #include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm64/boot/dts/qcom/msm8939-audio.dtsi b/arch/arm64/boot/dts/qcom/msm8939-audio.dtsi
new file mode 100644
index 000000000000..fe17bc28e825
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8939-audio.dtsi
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi
index adb96cd8d643..1ba802037989 100644
--- a/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi
@@ -9,6 +9,7 @@
  */
 
 #include "msm8939.dtsi"
+#include "msm8939-audio.dtsi"
 #include "pm8916.dtsi"
 
 &mdss_dsi0 {
diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
index eeb4d578c6fa..cf55b854b7a9 100644
--- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
+++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "msm8939.dtsi"
+#include "msm8939-audio.dtsi"
 #include "msm8939-pm8916.dtsi"
 #include <dt-bindings/arm/qcom,ids.h>
 #include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
index 68b92fdb996c..bee5fff2a80e 100644
--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
@@ -1638,51 +1638,7 @@ smd-edge {
 				label = "hexagon";
 
 				apr: apr {
-					compatible = "qcom,apr-v2";
 					qcom,smd-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-					status = "disabled";
-
-					q6core: service@3 {
-						compatible = "qcom,q6core";
-						reg = <APR_SVC_ADSP_CORE>;
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 			};
 		};
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 17/23] arm64: dts: qcom: msm8996: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (15 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 16/23] arm64: dts: qcom: msm8939: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 18/23] arm64: dts: qcom: sm6350: " srinivas.kandagatla
                   ` (6 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/apq8096-db820c.dts   |  1 +
 arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts  |  1 +
 arch/arm64/boot/dts/qcom/msm8929.dtsi         |  1 +
 arch/arm64/boot/dts/qcom/msm8996-audio.dtsi   | 14 ++++++
 .../boot/dts/qcom/msm8996-oneplus-common.dtsi |  1 +
 .../dts/qcom/msm8996-sony-xperia-tone.dtsi    |  1 +
 arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi    |  1 +
 .../boot/dts/qcom/msm8996-xiaomi-gemini.dts   |  1 +
 arch/arm64/boot/dts/qcom/msm8996.dtsi         | 48 +------------------
 arch/arm64/boot/dts/qcom/msm8996pro.dtsi      |  1 +
 10 files changed, 23 insertions(+), 47 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/msm8996-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index 5b2e88915c2f..5693778dca32 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "msm8996.dtsi"
+#include "msm8996-audio.dtsi"
 #include "pm8994.dtsi"
 #include "pmi8994.dtsi"
 #include <dt-bindings/input/input.h>
diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
index ac6471d1db1f..098ecd4561e7 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
@@ -3,6 +3,7 @@
 /dts-v1/;
 
 #include "msm8996.dtsi"
+#include "msm8996-audio.dtsi"
 #include "pm8994.dtsi"
 #include "pmi8994.dtsi"
 #include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm64/boot/dts/qcom/msm8929.dtsi b/arch/arm64/boot/dts/qcom/msm8929.dtsi
index ef7bb1ced954..14293ced4513 100644
--- a/arch/arm64/boot/dts/qcom/msm8929.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8929.dtsi
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include "msm8939.dtsi"
+#include "msm8939-audio.dtsi"
 
 &opp_table {
 	/delete-node/ opp-550000000;
diff --git a/arch/arm64/boot/dts/qcom/msm8996-audio.dtsi b/arch/arm64/boot/dts/qcom/msm8996-audio.dtsi
new file mode 100644
index 000000000000..6322af1e40a7
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8996-audio.dtsi
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include <dt-bindings/clock/qcom,gcc-msm8996.h>
+#include "elite-audio.dtsi"
+
+&apr {
+	power-domains = <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>;
+};
+
+&q6asmdai{
+	iommus = <&lpass_q6_smmu 1>;
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
index 63ab564655bc..440a129bc899 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include "msm8996.dtsi"
+#include "msm8996-audio.dtsi"
 #include "pm8994.dtsi"
 #include "pmi8994.dtsi"
 #include "pmi8996.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
index d55e4075040f..1c0efae7db2d 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
@@ -6,6 +6,7 @@
  */
 
 #include "msm8996.dtsi"
+#include "msm8996-audio.dtsi"
 #include "pm8994.dtsi"
 #include "pmi8994.dtsi"
 #include "pmi8996.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi b/arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi
index 929bdcd45d02..eb092337f3a9 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include "msm8996.dtsi"
+#include "msm8996-audio.dtsi"
 
 / {
 	qcom,msm-id = <246 0x30000>;
diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
index bd3f39e1b98f..806bf0031d81 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "msm8996.dtsi"
+#include "msm8996-audio.dtsi"
 #include "msm8996-xiaomi-common.dtsi"
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <dt-bindings/sound/qcom,q6asm.h>
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index f91605de4909..bf99f1ce5768 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -13,7 +13,6 @@
 #include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
-#include <dt-bindings/soc/qcom,apr.h>
 #include <dt-bindings/thermal/thermal.h>
 
 / {
@@ -3576,53 +3575,8 @@ smd-edge {
 				qcom,smd-edge = <1>;
 				qcom,remote-pid = <2>;
 
-				apr {
-					power-domains = <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>;
-					compatible = "qcom,apr-v2";
+				apr: apr {
 					qcom,smd-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					service@3 {
-						reg = <APR_SVC_ADSP_CORE>;
-						compatible = "qcom,q6core";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							dai@1 {
-								reg = <1>;
-							};
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							iommus = <&lpass_q6_smmu 1>;
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 
 				fastrpc {
diff --git a/arch/arm64/boot/dts/qcom/msm8996pro.dtsi b/arch/arm64/boot/dts/qcom/msm8996pro.dtsi
index b74cff06f300..1119b2e18df5 100644
--- a/arch/arm64/boot/dts/qcom/msm8996pro.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996pro.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include "msm8996.dtsi"
+#include "msm8996-audio.dtsi"
 
 / {
 	/delete-node/ opp-table-cluster0;
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 18/23] arm64: dts: qcom: sm6350: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (16 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 17/23] arm64: dts: qcom: msm8996: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 19/23] arm64: dts: qcom: msm8953: " srinivas.kandagatla
                   ` (5 subsequent siblings)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi.
This move removes duplication.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm6350-audio.dtsi    | 17 +++++
 .../qcom/sm6350-sony-xperia-lena-pdx213.dts   |  1 +
 arch/arm64/boot/dts/qcom/sm6350.dtsi          | 62 +------------------
 arch/arm64/boot/dts/qcom/sm7225.dtsi          |  1 +
 4 files changed, 20 insertions(+), 61 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm6350-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm6350-audio.dtsi b/arch/arm64/boot/dts/qcom/sm6350-audio.dtsi
new file mode 100644
index 000000000000..2ca406763e80
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm6350-audio.dtsi
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
+&q6asmdai{
+	iommus = <&apps_smmu 0x1001 0x0>;
+};
+
+&q6afe{
+	q6usbdai: usbd {
+		compatible = "qcom,q6usb";
+		#sound-dai-cells = <1>;
+		iommus = <&apps_smmu 0x100f 0x0>;
+		qcom,usb-audio-intr-idx = /bits/ 16 <2>;
+	};
+};
diff --git a/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts b/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts
index 8848043f95f2..224f769ee5c2 100644
--- a/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts
+++ b/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts
@@ -7,6 +7,7 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 #include "sm6350.dtsi"
+#include "sm6350-audio.dtsi"
 #include "pm6350.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
index 2d891a5640de..94db1dbceace 100644
--- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
@@ -1322,68 +1322,8 @@ IPCC_MPROC_SIGNAL_GLINK_QMP
 				label = "lpass";
 				qcom,remote-pid = <2>;
 
-				apr {
-					compatible = "qcom,apr-v2";
+				apr: apr{
 					qcom,glink-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					service@3 {
-						reg = <APR_SVC_ADSP_CORE>;
-						compatible = "qcom,q6core";
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-						};
-
-						q6afecc: clock-controller {
-							compatible = "qcom,q6afe-clocks";
-							#clock-cells = <2>;
-						};
-
-						q6usbdai: usbd {
-							compatible = "qcom,q6usb";
-							iommus = <&apps_smmu 0x100f 0x0>;
-							#sound-dai-cells = <1>;
-							qcom,usb-audio-intr-idx = /bits/ 16 <2>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-							iommus = <&apps_smmu 0x1001 0x0>;
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 
 				fastrpc {
diff --git a/arch/arm64/boot/dts/qcom/sm7225.dtsi b/arch/arm64/boot/dts/qcom/sm7225.dtsi
index a8ffdfb254fe..860b19440c54 100644
--- a/arch/arm64/boot/dts/qcom/sm7225.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm7225.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include "sm6350.dtsi"
+#include "sm6350-audio.dtsi"
 
 /* SM7225 uses Kryo 570 instead of Kryo 560 */
 &cpu0 { compatible = "qcom,kryo570"; };
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 19/23] arm64: dts: qcom: msm8953: use dedicated elite-audio dtsi
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (17 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 18/23] arm64: dts: qcom: sm6350: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-24  7:45   ` Stephan Gerhold
  2025-07-23 22:27 ` [PATCH 20/23] arm64: dts: qcom: sm8450: add sound prefix for wsa2 srinivas.kandagatla
                   ` (4 subsequent siblings)
  23 siblings, 1 reply; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Make use of elite-audio.dtsi and remove the arp nodes from SoC dtsi.
This move removes duplication.
Also msm8953 SoC level dtsi has q6asm-dai definations that should be
part of the board level dts, so clean this up as part of this patch.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/msm8953-audio.dtsi |  5 ++
 arch/arm64/boot/dts/qcom/msm8953.dtsi       | 78 +--------------------
 2 files changed, 6 insertions(+), 77 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/msm8953-audio.dtsi

diff --git a/arch/arm64/boot/dts/qcom/msm8953-audio.dtsi b/arch/arm64/boot/dts/qcom/msm8953-audio.dtsi
new file mode 100644
index 000000000000..fe17bc28e825
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8953-audio.dtsi
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "elite-audio.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index 273e79fb7569..aaf179c2eb53 100644
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -2015,84 +2015,8 @@ smd-edge {
 				qcom,smd-edge = <1>;
 				qcom,remote-pid = <2>;
 
-				apr {
-					compatible = "qcom,apr-v2";
+				apr: apr {
 					qcom,smd-channels = "apr_audio_svc";
-					qcom,domain = <APR_DOMAIN_ADSP>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					q6core: service@3 {
-						reg = <APR_SVC_ADSP_CORE>;
-						compatible = "qcom,q6core";
-					};
-
-					q6afe: service@4 {
-						compatible = "qcom,q6afe";
-						reg = <APR_SVC_AFE>;
-						q6afedai: dais {
-							compatible = "qcom,q6afe-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-
-							dai@16 {
-								reg = <PRIMARY_MI2S_RX>;
-								qcom,sd-lines = <0 1>;
-							};
-							dai@20 {
-								reg = <TERTIARY_MI2S_TX>;
-								qcom,sd-lines = <0 1>;
-							};
-							dai@127 {
-								reg = <QUINARY_MI2S_RX>;
-								qcom,sd-lines = <0>;
-							};
-						};
-
-						q6afecc: clock-controller {
-							compatible = "qcom,q6afe-clocks";
-							#clock-cells = <2>;
-						};
-					};
-
-					q6asm: service@7 {
-						compatible = "qcom,q6asm";
-						reg = <APR_SVC_ASM>;
-						q6asmdai: dais {
-							compatible = "qcom,q6asm-dais";
-							#address-cells = <1>;
-							#size-cells = <0>;
-							#sound-dai-cells = <1>;
-
-							dai@0 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA1>;
-								direction = <Q6ASM_DAI_RX>;
-							};
-							dai@1 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA2>;
-								direction = <Q6ASM_DAI_TX>;
-							};
-							dai@2 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA3>;
-								direction = <Q6ASM_DAI_RX>;
-							};
-							dai@3 {
-								reg = <MSM_FRONTEND_DAI_MULTIMEDIA4>;
-								direction = <Q6ASM_DAI_RX>;
-								is-compress-dai;
-							};
-						};
-					};
-
-					q6adm: service@8 {
-						compatible = "qcom,q6adm";
-						reg = <APR_SVC_ADM>;
-						q6routing: routing {
-							compatible = "qcom,q6adm-routing";
-							#sound-dai-cells = <0>;
-						};
-					};
 				};
 			};
 		};
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 19/23] arm64: dts: qcom: msm8953: use dedicated elite-audio dtsi
  2025-07-23 22:27 ` [PATCH 19/23] arm64: dts: qcom: msm8953: " srinivas.kandagatla
@ 2025-07-24  7:45   ` Stephan Gerhold
  0 siblings, 0 replies; 39+ messages in thread
From: Stephan Gerhold @ 2025-07-24  7:45 UTC (permalink / raw)
  To: srinivas.kandagatla
  Cc: andersson, konradybcio, robh, krzk+dt, conor+dt,
	cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On Wed, Jul 23, 2025 at 11:27:33PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> Make use of elite-audio.dtsi and remove the arp nodes from SoC dtsi.
> This move removes duplication.
> Also msm8953 SoC level dtsi has q6asm-dai definations that should be
> part of the board level dts, so clean this up as part of this patch.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>  arch/arm64/boot/dts/qcom/msm8953-audio.dtsi |  5 ++
>  arch/arm64/boot/dts/qcom/msm8953.dtsi       | 78 +--------------------
>  2 files changed, 6 insertions(+), 77 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/msm8953-audio.dtsi
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8953-audio.dtsi b/arch/arm64/boot/dts/qcom/msm8953-audio.dtsi
> new file mode 100644
> index 000000000000..fe17bc28e825
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/msm8953-audio.dtsi
> @@ -0,0 +1,5 @@
> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +#include "elite-audio.dtsi"
> diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> index 273e79fb7569..aaf179c2eb53 100644
> --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> @@ -2015,84 +2015,8 @@ smd-edge {
>  				qcom,smd-edge = <1>;
>  				qcom,remote-pid = <2>;
>  
> -				apr {
> -					compatible = "qcom,apr-v2";
> +				apr: apr {
>  					qcom,smd-channels = "apr_audio_svc";
> -					qcom,domain = <APR_DOMAIN_ADSP>;
> -					#address-cells = <1>;
> -					#size-cells = <0>;
> -
> -					q6core: service@3 {
> -						reg = <APR_SVC_ADSP_CORE>;
> -						compatible = "qcom,q6core";
> -					};
> -
> -					q6afe: service@4 {
> -						compatible = "qcom,q6afe";
> -						reg = <APR_SVC_AFE>;
> -						q6afedai: dais {
> -							compatible = "qcom,q6afe-dais";
> -							#address-cells = <1>;
> -							#size-cells = <0>;
> -							#sound-dai-cells = <1>;
> -
> -							dai@16 {
> -								reg = <PRIMARY_MI2S_RX>;
> -								qcom,sd-lines = <0 1>;
> -							};
> -							dai@20 {
> -								reg = <TERTIARY_MI2S_TX>;
> -								qcom,sd-lines = <0 1>;
> -							};
> -							dai@127 {
> -								reg = <QUINARY_MI2S_RX>;
> -								qcom,sd-lines = <0>;
> -							};

I don't think these belong into the SoC dtsi, but elite-audio.dtsi
doesn't have the backend DAI definitions / sd-lines, so removing these
will likely break audio.

> -						};
> -
> -						q6afecc: clock-controller {
> -							compatible = "qcom,q6afe-clocks";
> -							#clock-cells = <2>;
> -						};
> -					};
> -
> -					q6asm: service@7 {
> -						compatible = "qcom,q6asm";
> -						reg = <APR_SVC_ASM>;
> -						q6asmdai: dais {
> -							compatible = "qcom,q6asm-dais";
> -							#address-cells = <1>;
> -							#size-cells = <0>;
> -							#sound-dai-cells = <1>;
> -
> -							dai@0 {
> -								reg = <MSM_FRONTEND_DAI_MULTIMEDIA1>;
> -								direction = <Q6ASM_DAI_RX>;
> -							};
> -							dai@1 {
> -								reg = <MSM_FRONTEND_DAI_MULTIMEDIA2>;
> -								direction = <Q6ASM_DAI_TX>;
> -							};
> -							dai@2 {
> -								reg = <MSM_FRONTEND_DAI_MULTIMEDIA3>;
> -								direction = <Q6ASM_DAI_RX>;
> -							};
> -							dai@3 {
> -								reg = <MSM_FRONTEND_DAI_MULTIMEDIA4>;
> -								direction = <Q6ASM_DAI_RX>;
> -								is-compress-dai;

Same here for the compress DAI.

Stephan

^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 20/23] arm64: dts: qcom: sm8450: add sound prefix for wsa2
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (18 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 19/23] arm64: dts: qcom: msm8953: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:44   ` Dmitry Baryshkov
  2025-07-23 22:27 ` [PATCH 21/23] arm64: dts: qcom: sm8550: " srinivas.kandagatla
                   ` (3 subsequent siblings)
  23 siblings, 1 reply; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

WSA and WSA2 are two instances of WSA codec macro, this can lead
dupicate dapm widgets and mixers resulting in failing to probe
soundcard if both of these instances are part of the dai-link.

Correct way to address this is to add sound-name-prefix to WSA2
instances to avoid such confilcting mixers and dapm widgets.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8450.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index fa0822c37854..d8fd01997395 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -2827,6 +2827,7 @@ wsa2macro: codec@31e0000 {
 			#clock-cells = <0>;
 			clock-output-names = "wsa2-mclk";
 			#sound-dai-cells = <1>;
+			sound-name-prefix = "WSA2";
 		};
 
 		swr4: soundwire@31f0000 {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 20/23] arm64: dts: qcom: sm8450: add sound prefix for wsa2
  2025-07-23 22:27 ` [PATCH 20/23] arm64: dts: qcom: sm8450: add sound prefix for wsa2 srinivas.kandagatla
@ 2025-07-23 22:44   ` Dmitry Baryshkov
  2025-07-24  7:47     ` Stephan Gerhold
  0 siblings, 1 reply; 39+ messages in thread
From: Dmitry Baryshkov @ 2025-07-23 22:44 UTC (permalink / raw)
  To: srinivas.kandagatla
  Cc: andersson, konradybcio, robh, krzk+dt, conor+dt,
	cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On Wed, Jul 23, 2025 at 11:27:34PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> WSA and WSA2 are two instances of WSA codec macro, this can lead
> dupicate dapm widgets and mixers resulting in failing to probe
> soundcard if both of these instances are part of the dai-link.
> 
> Correct way to address this is to add sound-name-prefix to WSA2
> instances to avoid such confilcting mixers and dapm widgets.

This looks like a fix for an issue. Please mark it accordinggly and move
towards the start of the series.

> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>  arch/arm64/boot/dts/qcom/sm8450.dtsi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> index fa0822c37854..d8fd01997395 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> @@ -2827,6 +2827,7 @@ wsa2macro: codec@31e0000 {
>  			#clock-cells = <0>;
>  			clock-output-names = "wsa2-mclk";
>  			#sound-dai-cells = <1>;
> +			sound-name-prefix = "WSA2";
>  		};
>  
>  		swr4: soundwire@31f0000 {
> -- 
> 2.50.0
> 

-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: [PATCH 20/23] arm64: dts: qcom: sm8450: add sound prefix for wsa2
  2025-07-23 22:44   ` Dmitry Baryshkov
@ 2025-07-24  7:47     ` Stephan Gerhold
  0 siblings, 0 replies; 39+ messages in thread
From: Stephan Gerhold @ 2025-07-24  7:47 UTC (permalink / raw)
  To: Dmitry Baryshkov
  Cc: srinivas.kandagatla, andersson, konradybcio, robh, krzk+dt,
	conor+dt, cros-qcom-dts-watchers, linux-arm-msm, linux-kernel

On Thu, Jul 24, 2025 at 01:44:09AM +0300, Dmitry Baryshkov wrote:
> On Wed, Jul 23, 2025 at 11:27:34PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> > From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> > 
> > WSA and WSA2 are two instances of WSA codec macro, this can lead
> > dupicate dapm widgets and mixers resulting in failing to probe
> > soundcard if both of these instances are part of the dai-link.
> > 
> > Correct way to address this is to add sound-name-prefix to WSA2
> > instances to avoid such confilcting mixers and dapm widgets.
> 
> This looks like a fix for an issue. Please mark it accordinggly and move
> towards the start of the series.
> 

It doesn't really have anything to do with the rest of the series at
all, so those should be ideally sent as a separate series. They can be
picked up much easier compared to the large refactoring of the other
patches.

Thanks,
Stephan

^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 21/23] arm64: dts: qcom: sm8550: add sound prefix for wsa2
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (19 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 20/23] arm64: dts: qcom: sm8450: add sound prefix for wsa2 srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-24  8:20   ` neil.armstrong
  2025-07-23 22:27 ` [PATCH 22/23] arm64: dts: qcom: sm8750: " srinivas.kandagatla
                   ` (2 subsequent siblings)
  23 siblings, 1 reply; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

WSA and WSA2 are two instances of WSA codec macro, this can lead
dupicate dapm widgets and mixers resulting in failing to probe
soundcard if both of these instances are part of the dai-link.

Correct way to address this is to add sound-name-prefix to WSA2
instances to avoid such confilcting mixers and dapm widgets.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8550.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index d35d2b9b438d..5f748f6eb27a 100644
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -2811,6 +2811,7 @@ lpass_wsa2macro: codec@6aa0000 {
 			#clock-cells = <0>;
 			clock-output-names = "wsa2-mclk";
 			#sound-dai-cells = <1>;
+			sound-name-prefix = "WSA2";
 		};
 
 		swr3: soundwire@6ab0000 {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 21/23] arm64: dts: qcom: sm8550: add sound prefix for wsa2
  2025-07-23 22:27 ` [PATCH 21/23] arm64: dts: qcom: sm8550: " srinivas.kandagatla
@ 2025-07-24  8:20   ` neil.armstrong
  0 siblings, 0 replies; 39+ messages in thread
From: neil.armstrong @ 2025-07-24  8:20 UTC (permalink / raw)
  To: srinivas.kandagatla, andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel

Hi,

On 24/07/2025 00:27, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> WSA and WSA2 are two instances of WSA codec macro, this can lead
> dupicate dapm widgets and mixers resulting in failing to probe


duplicate

> soundcard if both of these instances are part of the dai-link.
> 
> Correct way to address this is to add sound-name-prefix to WSA2
> instances to avoid such confilcting mixers and dapm widgets.

conflicting

> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>   arch/arm64/boot/dts/qcom/sm8550.dtsi | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
> index d35d2b9b438d..5f748f6eb27a 100644
> --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
> @@ -2811,6 +2811,7 @@ lpass_wsa2macro: codec@6aa0000 {
>   			#clock-cells = <0>;
>   			clock-output-names = "wsa2-mclk";
>   			#sound-dai-cells = <1>;
> +			sound-name-prefix = "WSA2";
>   		};
>   
>   		swr3: soundwire@6ab0000 {


Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

^ permalink raw reply	[flat|nested] 39+ messages in thread

* [PATCH 22/23] arm64: dts: qcom: sm8750: add sound prefix for wsa2
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (20 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 21/23] arm64: dts: qcom: sm8550: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-23 22:27 ` [PATCH 23/23] arm64: dts: qcom: sm8650: " srinivas.kandagatla
  2025-07-25  3:19 ` [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services Rob Herring (Arm)
  23 siblings, 0 replies; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

WSA and WSA2 are two instances of WSA codec macro, this can lead
dupicate dapm widgets and mixers resulting in failing to probe
soundcard if both of these instances are part of the dai-link.

Correct way to address this is to add sound-name-prefix to WSA2
instances to avoid such confilcting mixers and dapm widgets.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8750.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8750.dtsi b/arch/arm64/boot/dts/qcom/sm8750.dtsi
index 952f6cfcdccf..c9abffcdd21b 100644
--- a/arch/arm64/boot/dts/qcom/sm8750.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8750.dtsi
@@ -2213,6 +2213,7 @@ lpass_wsa2macro: codec@6aa0000 {
 			#clock-cells = <0>;
 			clock-output-names = "wsa2-mclk";
 			#sound-dai-cells = <1>;
+			sound-name-prefix = "WSA2";
 		};
 
 		swr3: soundwire@6ab0000 {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [PATCH 23/23] arm64: dts: qcom: sm8650: add sound prefix for wsa2
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (21 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 22/23] arm64: dts: qcom: sm8750: " srinivas.kandagatla
@ 2025-07-23 22:27 ` srinivas.kandagatla
  2025-07-24  8:20   ` neil.armstrong
  2025-07-25  3:19 ` [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services Rob Herring (Arm)
  23 siblings, 1 reply; 39+ messages in thread
From: srinivas.kandagatla @ 2025-07-23 22:27 UTC (permalink / raw)
  To: andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel, Srinivas Kandagatla

From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

WSA and WSA2 are two instances of WSA codec macro, this can lead
dupicate dapm widgets and mixers resulting in failing to probe
soundcard if both of these instances are part of the dai-link.

Correct way to address this is to add sound-name-prefix to WSA2
instances to avoid such confilcting mixers and dapm widgets.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8650.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
index 5212000bf34c..8b43ded297c8 100644
--- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
@@ -4526,6 +4526,7 @@ lpass_wsa2macro: codec@6aa0000 {
 			#clock-cells = <0>;
 			clock-output-names = "wsa2-mclk";
 			#sound-dai-cells = <1>;
+			sound-name-prefix = "WSA2";
 		};
 
 		swr3: soundwire@6ab0000 {
-- 
2.50.0


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* Re: [PATCH 23/23] arm64: dts: qcom: sm8650: add sound prefix for wsa2
  2025-07-23 22:27 ` [PATCH 23/23] arm64: dts: qcom: sm8650: " srinivas.kandagatla
@ 2025-07-24  8:20   ` neil.armstrong
  0 siblings, 0 replies; 39+ messages in thread
From: neil.armstrong @ 2025-07-24  8:20 UTC (permalink / raw)
  To: srinivas.kandagatla, andersson, konradybcio
  Cc: robh, krzk+dt, conor+dt, cros-qcom-dts-watchers, linux-arm-msm,
	linux-kernel

On 24/07/2025 00:27, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> WSA and WSA2 are two instances of WSA codec macro, this can lead
> dupicate dapm widgets and mixers resulting in failing to probe

duplicate

> soundcard if both of these instances are part of the dai-link.
> 
> Correct way to address this is to add sound-name-prefix to WSA2
> instances to avoid such confilcting mixers and dapm widgets.

conflicting

> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>   arch/arm64/boot/dts/qcom/sm8650.dtsi | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
> index 5212000bf34c..8b43ded297c8 100644
> --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
> @@ -4526,6 +4526,7 @@ lpass_wsa2macro: codec@6aa0000 {
>   			#clock-cells = <0>;
>   			clock-output-names = "wsa2-mclk";
>   			#sound-dai-cells = <1>;
> +			sound-name-prefix = "WSA2";
>   		};
>   
>   		swr3: soundwire@6ab0000 {

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

^ permalink raw reply	[flat|nested] 39+ messages in thread

* Re: [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services
  2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
                   ` (22 preceding siblings ...)
  2025-07-23 22:27 ` [PATCH 23/23] arm64: dts: qcom: sm8650: " srinivas.kandagatla
@ 2025-07-25  3:19 ` Rob Herring (Arm)
  23 siblings, 0 replies; 39+ messages in thread
From: Rob Herring (Arm) @ 2025-07-25  3:19 UTC (permalink / raw)
  To: srinivas.kandagatla
  Cc: cros-qcom-dts-watchers, linux-arm-msm, linux-kernel, andersson,
	krzk+dt, conor+dt, konradybcio


On Wed, 23 Jul 2025 23:27:14 +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> All the SoC level dts has exactly same device tree entires for DSP Audio
> sevices (apr, gpr, afe, apm, asm, adm) and its child devices.
> 
> It does not make sense to keep copying the same content over and over
> for each SoC, This patch series moves DSP services to common dtsi file
> so that it eliminates duplicate content,  makes audio dts much consistent
> and makes it easy for adding audio support for new SoC.
> As part of this cleanup, two common dtsi files (elite and audioreach)
> based on q6dsp framework are added and a SoC level audio.dtsi needs to add
> the required iommu configuration for the audio stream service.
> 
> This patch series also addresses another issue found with multiple
> instances of wsa codec macro, his can lead duplicate dapm widgets
> and mixers resulting in failing to probe sound-card if both of
> these instances are part of the dai-link.
> 
> Tested this on X13s, any testing is appreciated.
> 
> Srinivas Kandagatla (23):
>   arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts
>   arm64: dts: qcom: sc8280xp: use dedicated audioreach dtsi
>   arm64: dts: qcom: sm8650: use dedicated audioreach dtsi
>   arm64: dts: qcom: sm8550: use dedicated audioreach dtsi
>   arm64: dts: qcom: sm8450: use dedicated audioreach dtsi
>   arm64: dts: qcom: sar2130p: use dedicated audioreach dtsi
>   arm64: dts: qcom: sm8350: move dsp audio nodes to dedicated dts
>   arm64: dts: qcom: sm8250: use dedicated elite dtsi
>   arm64: dts: qcom: sm6115: use dedicated elite dtsi
>   arm64: dts: qcom: sdm845: use dedicated elite-audio dtsi
>   arm64: dts: qcom: sdm630: use dedicated elite-audio dtsi
>   arm64: dts: qcom: sc7280: use dedicated elite-audio dtsi
>   arm64: dts: qcom: sc7180: use dedicated elite-audio dtsi
>   arm64: dts: qcom: sm8750: use dedicated audioreach dtsi
>   arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi
>   arm64: dts: qcom: msm8939: use dedicated elite-audio dtsi
>   arm64: dts: qcom: msm8996: use dedicated elite-audio dtsi
>   arm64: dts: qcom: sm6350: use dedicated elite-audio dtsi
>   arm64: dts: qcom: msm8953: use dedicated elite-audio dtsi
>   arm64: dts: qcom: sm8450: add sound prefix for wsa2
>   arm64: dts: qcom: sm8550: add sound prefix for wsa2
>   arm64: dts: qcom: sm8750: add sound prefix for wsa2
>   arm64: dts: qcom: sm8650: add sound prefix for wsa2
> 
>  arch/arm64/boot/dts/qcom/apq8039-t2.dts       |  1 +
>  arch/arm64/boot/dts/qcom/apq8096-db820c.dts   |  1 +
>  arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts  |  1 +
>  .../arm64/boot/dts/qcom/audioreach-audio.dtsi | 45 ++++++++++
>  arch/arm64/boot/dts/qcom/elite-audio.dtsi     | 86 +++++++++++++++++++
>  arch/arm64/boot/dts/qcom/msm8916-audio.dtsi   |  5 ++
>  arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi  |  1 +
>  arch/arm64/boot/dts/qcom/msm8916.dtsi         | 44 ----------
>  arch/arm64/boot/dts/qcom/msm8929.dtsi         |  1 +
>  arch/arm64/boot/dts/qcom/msm8939-audio.dtsi   |  5 ++
>  arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi  |  1 +
>  .../qcom/msm8939-sony-xperia-kanuti-tulip.dts |  1 +
>  arch/arm64/boot/dts/qcom/msm8939.dtsi         | 44 ----------
>  arch/arm64/boot/dts/qcom/msm8953-audio.dtsi   |  5 ++
>  arch/arm64/boot/dts/qcom/msm8953.dtsi         | 78 +----------------
>  arch/arm64/boot/dts/qcom/msm8996-audio.dtsi   | 14 +++
>  .../boot/dts/qcom/msm8996-oneplus-common.dtsi |  1 +
>  .../dts/qcom/msm8996-sony-xperia-tone.dtsi    |  1 +
>  arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi    |  1 +
>  .../boot/dts/qcom/msm8996-xiaomi-gemini.dts   |  1 +
>  arch/arm64/boot/dts/qcom/msm8996.dtsi         | 48 +----------
>  arch/arm64/boot/dts/qcom/msm8996pro.dtsi      |  1 +
>  .../boot/dts/qcom/qcm6490-fairphone-fp5.dts   |  1 +
>  arch/arm64/boot/dts/qcom/qcm6490-idp.dts      |  1 +
>  .../boot/dts/qcom/qcm6490-shift-otter.dts     |  1 +
>  arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts  |  1 +
>  arch/arm64/boot/dts/qcom/qcs8550.dtsi         |  1 +
>  arch/arm64/boot/dts/qcom/qrb5165-rb5.dts      |  1 +
>  arch/arm64/boot/dts/qcom/sa8540p.dtsi         |  1 +
>  arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi  |  5 ++
>  .../arm64/boot/dts/qcom/sar2130p-qar2130p.dts |  1 +
>  arch/arm64/boot/dts/qcom/sar2130p.dtsi        | 40 +--------
>  .../boot/dts/qcom/sc7180-acer-aspire1.dts     |  1 +
>  arch/arm64/boot/dts/qcom/sc7180-audio.dtsi    |  8 ++
>  arch/arm64/boot/dts/qcom/sc7180-idp.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  |  1 +
>  arch/arm64/boot/dts/qcom/sc7180.dtsi          | 56 +-----------
>  arch/arm64/boot/dts/qcom/sc7280-audio.dtsi    |  8 ++
>  arch/arm64/boot/dts/qcom/sc7280-idp.dtsi      |  1 +
>  arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi    |  1 +
>  arch/arm64/boot/dts/qcom/sc7280.dtsi          | 68 +--------------
>  arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi  |  9 ++
>  arch/arm64/boot/dts/qcom/sc8280xp-crd.dts     |  1 +
>  .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts |  1 +
>  .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts    |  1 +
>  .../dts/qcom/sc8280xp-microsoft-arcata.dts    |  1 +
>  .../dts/qcom/sc8280xp-microsoft-blackrock.dts |  1 +
>  arch/arm64/boot/dts/qcom/sc8280xp.dtsi        | 38 +-------
>  arch/arm64/boot/dts/qcom/sdm630-audio.dtsi    |  8 ++
>  .../qcom/sdm630-sony-xperia-ganges-kirin.dts  |  1 +
>  .../sdm630-sony-xperia-nile-discovery.dts     |  1 +
>  .../qcom/sdm630-sony-xperia-nile-pioneer.dts  |  1 +
>  .../qcom/sdm630-sony-xperia-nile-voyager.dts  |  1 +
>  arch/arm64/boot/dts/qcom/sdm630.dtsi          | 45 +---------
>  arch/arm64/boot/dts/qcom/sdm845-audio.dtsi    |  8 ++
>  arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi    |  1 +
>  arch/arm64/boot/dts/qcom/sdm845-db845c.dts    |  1 +
>  .../arm64/boot/dts/qcom/sdm845-lg-common.dtsi |  1 +
>  arch/arm64/boot/dts/qcom/sdm845-mtp.dts       |  1 +
>  .../boot/dts/qcom/sdm845-oneplus-common.dtsi  |  1 +
>  .../dts/qcom/sdm845-samsung-starqltechn.dts   |  1 +
>  .../boot/dts/qcom/sdm845-shift-axolotl.dts    |  1 +
>  .../dts/qcom/sdm845-sony-xperia-tama.dtsi     |  1 +
>  .../qcom/sdm845-xiaomi-beryllium-common.dtsi  |  1 +
>  .../boot/dts/qcom/sdm845-xiaomi-polaris.dts   |  1 +
>  arch/arm64/boot/dts/qcom/sdm845.dtsi          | 49 +----------
>  arch/arm64/boot/dts/qcom/sdm850.dtsi          |  1 +
>  arch/arm64/boot/dts/qcom/sm4250.dtsi          |  1 +
>  arch/arm64/boot/dts/qcom/sm6115-audio.dtsi    |  8 ++
>  .../boot/dts/qcom/sm6115-fxtec-pro1x.dts      |  1 +
>  arch/arm64/boot/dts/qcom/sm6115.dtsi          | 69 +--------------
>  .../boot/dts/qcom/sm6115p-lenovo-j606f.dts    |  1 +
>  arch/arm64/boot/dts/qcom/sm6350-audio.dtsi    | 17 ++++
>  .../qcom/sm6350-sony-xperia-lena-pdx213.dts   |  1 +
>  arch/arm64/boot/dts/qcom/sm6350.dtsi          | 62 +------------
>  arch/arm64/boot/dts/qcom/sm7125.dtsi          |  1 +
>  arch/arm64/boot/dts/qcom/sm7225.dtsi          |  1 +
>  arch/arm64/boot/dts/qcom/sm7325.dtsi          |  1 +
>  arch/arm64/boot/dts/qcom/sm8250-audio.dtsi    |  8 ++
>  arch/arm64/boot/dts/qcom/sm8250-hdk.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8250-mtp.dts       |  1 +
>  .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi |  1 +
>  .../dts/qcom/sm8250-xiaomi-elish-common.dtsi  |  1 +
>  .../boot/dts/qcom/sm8250-xiaomi-pipa.dts      |  1 +
>  arch/arm64/boot/dts/qcom/sm8250.dtsi          | 53 +-----------
>  arch/arm64/boot/dts/qcom/sm8350-audio.dtsi    |  8 ++
>  arch/arm64/boot/dts/qcom/sm8350-hdk.dts       |  1 +
>  .../qcom/sm8350-microsoft-surface-duo2.dts    |  1 +
>  arch/arm64/boot/dts/qcom/sm8350-mtp.dts       |  1 +
>  .../dts/qcom/sm8350-sony-xperia-sagami.dtsi   |  1 +
>  arch/arm64/boot/dts/qcom/sm8350.dtsi          | 67 +--------------
>  arch/arm64/boot/dts/qcom/sm8450-audio.dtsi    |  5 ++
>  arch/arm64/boot/dts/qcom/sm8450-hdk.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8450-qrd.dts       |  1 +
>  .../dts/qcom/sm8450-sony-xperia-nagara.dtsi   |  1 +
>  arch/arm64/boot/dts/qcom/sm8450.dtsi          | 40 +--------
>  arch/arm64/boot/dts/qcom/sm8550-audio.dtsi    | 10 +++
>  arch/arm64/boot/dts/qcom/sm8550-hdk.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8550-mtp.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8550-qrd.dts       |  1 +
>  .../boot/dts/qcom/sm8550-samsung-q5q.dts      |  1 +
>  .../qcom/sm8550-sony-xperia-yodo-pdx234.dts   |  1 +
>  arch/arm64/boot/dts/qcom/sm8550.dtsi          | 45 +---------
>  arch/arm64/boot/dts/qcom/sm8650-audio.dtsi    | 10 +++
>  arch/arm64/boot/dts/qcom/sm8650-hdk.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8650-mtp.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8650-qrd.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8650.dtsi          | 44 +---------
>  arch/arm64/boot/dts/qcom/sm8750-audio.dtsi    | 10 +++
>  arch/arm64/boot/dts/qcom/sm8750-mtp.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8750-qrd.dts       |  1 +
>  arch/arm64/boot/dts/qcom/sm8750.dtsi          | 42 +--------
>  .../boot/dts/qcom/x1-asus-zenbook-a14.dtsi    |  1 +
>  arch/arm64/boot/dts/qcom/x1-crd.dtsi          |  1 +
>  arch/arm64/boot/dts/qcom/x1e001de-devkit.dts  |  1 +
>  .../qcom/x1e78100-lenovo-thinkpad-t14s.dtsi   |  1 +
>  .../dts/qcom/x1e80100-asus-vivobook-s15.dts   |  1 +
>  arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi  |  6 ++
>  .../dts/qcom/x1e80100-dell-xps13-9345.dts     |  1 +
>  .../dts/qcom/x1e80100-hp-omnibook-x14.dts     |  1 +
>  .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  |  1 +
>  .../dts/qcom/x1e80100-microsoft-romulus.dtsi  |  1 +
>  arch/arm64/boot/dts/qcom/x1e80100-qcp.dts     |  1 +
>  arch/arm64/boot/dts/qcom/x1e80100.dtsi        | 43 +---------
>  124 files changed, 401 insertions(+), 946 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/audioreach-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/elite-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/msm8916-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/msm8939-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/msm8953-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/msm8996-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sar2130p-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7280-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sdm630-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sdm845-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sm6115-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sm6350-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sm8250-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sm8350-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sm8450-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sm8550-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sm8650-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sm8750-audio.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-audio.dtsi
> 
> --
> 2.50.0
> 
> 
> 


My bot found new DTB warnings on the .dts files added or changed in this
series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:

  pip3 install dtschema --upgrade


This patch series was applied (using b4) to base:
 Base: attempting to guess base-commit...
 Base: remotes/next/fs-next-11017-gdc9b385a8a2e (best guess, 102/103 blobs matched)

If this is not the correct base, please add 'base-commit' tag
(or use b4 which does this automatically)

New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/qcom/' for 20250723222737.35561-1-srinivas.kandagatla@oss.qualcomm.com:

arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): glink-edge:apr:qcom,glink-channels:0: 'adsp_apps' was expected
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): glink-edge:apr: 'compatible' is a required property
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): glink-edge:apr: 'qcom,domain' is a required property
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): glink-edge: Unevaluated properties are not allowed ('apr' was unexpected)
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): Unevaluated properties are not allowed ('clock-names', 'clocks', 'glink-edge', 'interrupt-names', 'interrupts-extended', 'power-domain-names', 'power-domains', 'qcom,smem-state-names', 'qcom,smem-states' were unexpected)
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dtb: remoteproc@c200000 (qcom,msm8953-adsp-pil): smd-edge:apr: 'compatible' is a required property
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dtb: remoteproc@c200000 (qcom,msm8953-adsp-pil): smd-edge:apr: 'qcom,domain' is a required property
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dtb: remoteproc@c200000 (qcom,msm8953-adsp-pil): smd-edge: Unevaluated properties are not allowed ('apr' was unexpected)
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dtb: remoteproc@c200000 (qcom,msm8953-adsp-pil): Unevaluated properties are not allowed ('qcom,smem-state-names', 'qcom,smem-states', 'smd-edge' were unexpected)
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dtb: smd-edge: apr: 'compatible' is a required property
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,smd-edge.yaml#
arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dtb: smd-edge: apr: 'qcom,domain' is a required property
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,smd-edge.yaml#
arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): glink-edge:apr:qcom,glink-channels:0: 'adsp_apps' was expected
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): glink-edge:apr: 'compatible' is a required property
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): glink-edge:apr: 'qcom,domain' is a required property
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): glink-edge: Unevaluated properties are not allowed ('apr' was unexpected)
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#
arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dtb: remoteproc@15700000 (qcom,sdm660-adsp-pas): Unevaluated properties are not allowed ('clock-names', 'clocks', 'glink-edge', 'interrupt-names', 'interrupts-extended', 'power-domain-names', 'power-domains', 'qcom,smem-state-names', 'qcom,smem-states' were unexpected)
	from schema $id: http://devicetree.org/schemas/remoteproc/qcom,adsp.yaml#






^ permalink raw reply	[flat|nested] 39+ messages in thread

end of thread, other threads:[~2025-07-25  3:19 UTC | newest]

Thread overview: 39+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-23 22:27 [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts srinivas.kandagatla
2025-07-24  7:23   ` Stephan Gerhold
2025-07-24  9:50     ` Srinivas Kandagatla
2025-07-24 11:32   ` Konrad Dybcio
2025-07-23 22:27 ` [PATCH 02/23] arm64: dts: qcom: sc8280xp: use dedicated audioreach dtsi srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 03/23] arm64: dts: qcom: sm8650: " srinivas.kandagatla
2025-07-24  8:26   ` neil.armstrong
2025-07-24  9:54     ` Srinivas Kandagatla
2025-07-23 22:27 ` [PATCH 04/23] arm64: dts: qcom: sm8550: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 05/23] arm64: dts: qcom: sm8450: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 06/23] arm64: dts: qcom: sar2130p: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 07/23] arm64: dts: qcom: sm8350: move dsp audio nodes to dedicated dts srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 08/23] arm64: dts: qcom: sm8250: use dedicated elite dtsi srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 09/23] arm64: dts: qcom: sm6115: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 10/23] arm64: dts: qcom: sdm845: use dedicated elite-audio dtsi srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 11/23] arm64: dts: qcom: sdm630: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 12/23] arm64: dts: qcom: sc7280: " srinivas.kandagatla
2025-07-24  7:34   ` Stephan Gerhold
2025-07-23 22:27 ` [PATCH 13/23] arm64: dts: qcom: sc7180: " srinivas.kandagatla
2025-07-24  7:38   ` Stephan Gerhold
2025-07-24 10:41     ` Srinivas Kandagatla
2025-07-23 22:27 ` [PATCH 14/23] arm64: dts: qcom: sm8750: use dedicated audioreach dtsi srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 15/23] arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi srinivas.kandagatla
2025-07-24  7:42   ` Stephan Gerhold
2025-07-23 22:27 ` [PATCH 16/23] arm64: dts: qcom: msm8939: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 17/23] arm64: dts: qcom: msm8996: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 18/23] arm64: dts: qcom: sm6350: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 19/23] arm64: dts: qcom: msm8953: " srinivas.kandagatla
2025-07-24  7:45   ` Stephan Gerhold
2025-07-23 22:27 ` [PATCH 20/23] arm64: dts: qcom: sm8450: add sound prefix for wsa2 srinivas.kandagatla
2025-07-23 22:44   ` Dmitry Baryshkov
2025-07-24  7:47     ` Stephan Gerhold
2025-07-23 22:27 ` [PATCH 21/23] arm64: dts: qcom: sm8550: " srinivas.kandagatla
2025-07-24  8:20   ` neil.armstrong
2025-07-23 22:27 ` [PATCH 22/23] arm64: dts: qcom: sm8750: " srinivas.kandagatla
2025-07-23 22:27 ` [PATCH 23/23] arm64: dts: qcom: sm8650: " srinivas.kandagatla
2025-07-24  8:20   ` neil.armstrong
2025-07-25  3:19 ` [PATCH 00/23] arm64: dts: qcom: cleanup DSP audio services Rob Herring (Arm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).