| 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-19-srinivas.kandagatla@oss.qualcomm.com>
Date: Wed, 23 Jul 2025 23:27:32 +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 18/23] arm64: dts: qcom: sm6350: 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/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
Powered by blists - more mailing lists