[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250723222737.35561-20-srinivas.kandagatla@oss.qualcomm.com>
Date: Wed, 23 Jul 2025 23:27:33 +0100
From: srinivas.kandagatla@....qualcomm.com
To: andersson@...nel.org, konradybcio@...nel.org
Cc: robh@...nel.org, krzk+dt@...nel.org, conor+dt@...nel.org,
cros-qcom-dts-watchers@...omium.org, linux-arm-msm@...r.kernel.org,
linux-kernel@...r.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@....qualcomm.com>
Subject: [PATCH 19/23] arm64: dts: qcom: msm8953: use dedicated elite-audio dtsi
From: Srinivas Kandagatla <srinivas.kandagatla@....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@....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
Powered by blists - more mailing lists