| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250723222737.35561-18-srinivas.kandagatla@oss.qualcomm.com>
Date: Wed, 23 Jul 2025 23:27:31 +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 17/23] arm64: dts: qcom: msm8996: use dedicated elite-audio dtsi
From: Srinivas Kandagatla <srinivas.kandagatla@....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@....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
Powered by blists - more mailing lists