From nobody Mon Oct 6 08:29:10 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D1FD2749C8 for ; Wed, 23 Jul 2025 22:28:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309684; cv=none; b=FZ9tiIUo2y5su6P/GBqKc8xPsVj6jinSKuxL6ZbzmuS6CRWQEKxB3x3eNMXNHIqlJNM963Dn+i3BRPycVlyQU7g8yGqtbxIUgPYL2RqQGZ5xKvTf9bKuHOeKlBnXbbyHbt6ihZSkmCUCPGFCl2dwlx8eXLj92P6Z0YOILGaGGDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309684; c=relaxed/simple; bh=sR6kzyTuhf6EhARguJqQOQtx9SaauGhKilYXdE8JJmw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l6TENYy+FVHRLyoA9PrF9l58A8S+5ETniBuT0C/NlOpuIvJL0rkaAyU5I2FF3zFiJDf2+dKHVurMlTeiroAXAlV7J4kUzPlyejLplCq/frXwOEQTvTqeXFDnRTpQwHkChmjGlYY9vh9G6jYw7yoWuMEP3WdNZwWbnonkHEKvu8s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=R4FtGK50; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="R4FtGK50" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHW9Pf013775 for ; Wed, 23 Jul 2025 22:28:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=zXHl0/i2Sl3 JzwrP0dNf7zMcC90T7Kt5lE3HmQz9cMY=; b=R4FtGK50Y24Sl7FbRI1PAjtK16b GTYxdaXe5uP9UM2cbs6+XtzYYCpXw9WkFJy8NQKpafuKWKnp1cCnEK12H3IdORty tBOwe7z8e2088KP2k0nuWrBlNYqNAAacSqfGHNqslc437s83md0zPJ64I7HcG5nw isCqBU2Av61ExoqpvKT8Zhna11Tk45bf8WJjtZQqasXrZjGyFvtKeMQM71FPDuY3 1oInnzLKMI/sTR+Cxom5ZDL00E+GwznVjTSL5BO/rrdfhMHAyJts2H8uXPDfudTd pRFCw2jXTofNopW5KyoN3XWZks4c12rBEpw0w0a5G/hUW6P8Z6MNHNuhCnw== Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48048vd21m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:01 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-70707aed1eeso6100766d6.3 for ; Wed, 23 Jul 2025 15:28:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309680; x=1753914480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zXHl0/i2Sl3JzwrP0dNf7zMcC90T7Kt5lE3HmQz9cMY=; b=K/ZIjmuYYm3sy63IZ2oBZ2uzkQXby3LqfcQEEYgtS2B2vnFzd+XwrQTnml7LffNSMZ X9ihklRsVQ7AOFv0/fIS2JEz2AzTqUCrXKc2DS0umlEB9+82q48yt1tiK1hCYfWkP6Nd gTBs7F5cMj0qbDo2DC7Hxv3EqRcfn/k+oxDitV7zDoHw7NLefWa8GpC+iZYnhz+6IA5E epYbnXjWdX7HStnULiQ+6vShkPmxCNxS47mVMtwzJ49rnLlStaZ0IXJIoMm7llhPGFpO 7KMkats/yB4c2k6bY/kJZzY+ooKKaI7v9AsLfuNLVdUvqNPxIu7l1mkWLSAxEgQ+mRkR jb5Q== X-Forwarded-Encrypted: i=1; AJvYcCVvW1K9iAr44RLY/rZYcQVFbSwiI1P3Ga+f1yWIFmLdToZgBExYA63BO1oKP4G4rt36Ht8JfpAGBTGCyLA=@vger.kernel.org X-Gm-Message-State: AOJu0YzwrXvLtNMTW5kCbRLvoR18Vn148HF3mo2tYJUPCIBuOHf2VCK9 lsXmHTLETz44Ii1JXgYBNIkUcu8OlEBJXFulHNAGq86hhSg6N4Z1WWCwalNoVBVxd9uJKs19wsv LPTHzcr6sLxR1r9phPCzrtQfS0kSVMpR0S0JxWUP1ZqN7AS/CZjO56a3v6ZSwLxIZIHY= X-Gm-Gg: ASbGncvVRW0cEFmLkGnALr12Ceo+/SGX0eemjXDPTAn6CvanPRjzrDNip9bh0Ax65Ys m1r9S+z0tg4p7IXEYp0a9k6X19q+llLjHAmNl5KyooyMjaPdkl9bdNrtVrPv4mHBPv1Ro/5spjI nSdM5gVSCCUm1FhX9cIm+JBzL1COHeajNDG/4k1BL4IV4cATe2ab58qun6u6eNL74Pan6YkNgu3 Tf8Nn3fQga+Zq57jJ+0WHJUO1c148bPIViUoMTfejAsuphlrfg1zK/o5tk9hrbGeF3dAKnSYjiT iSsKlNeoBvZLb79l1AHSUhHkiL/C0vgE61x+c3BUUD6G/7RvcS9hoQ== X-Received: by 2002:ad4:5bc8:0:b0:703:54d0:73a0 with SMTP id 6a1803df08f44-707006f05ecmr50973386d6.32.1753309680214; Wed, 23 Jul 2025 15:28:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFEJKMu1xZLMi299MwK611bs98B1sjWGgQgSFldhjc3zqu9xWvXZlS2op+z5fjK7k7q6/9vvw== X-Received: by 2002:ad4:5bc8:0:b0:703:54d0:73a0 with SMTP id 6a1803df08f44-707006f05ecmr50973216d6.32.1753309679753; Wed, 23 Jul 2025 15:27:59 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:27:58 -0700 (PDT) From: srinivas.kandagatla@oss.qualcomm.com To: andersson@kernel.org, konradybcio@kernel.org Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, cros-qcom-dts-watchers@chromium.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 07/23] arm64: dts: qcom: sm8350: move dsp audio nodes to dedicated dts Date: Wed, 23 Jul 2025 23:27:21 +0100 Message-ID: <20250723222737.35561-8-srinivas.kandagatla@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250723222737.35561-1-srinivas.kandagatla@oss.qualcomm.com> References: <20250723222737.35561-1-srinivas.kandagatla@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: xQVlZkSdBk_Lu-zcMVqzzR1UneivKd3W X-Authority-Analysis: v=2.4 cv=SYL3duRu c=1 sm=1 tr=0 ts=688161f1 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=sC-n5_SLUXhAJjBL1AgA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfXzwnkmDeayORU DJXSTGayNuzN0isDiNWtenMUYmQniqxnfL4vNPe6e3Zk6klEZ2T4wZVIoLY0kBAQVuUE7awIR2c l9vi64a8wyd1qLDAFDO/yT3edv5BzDmXZERJAu7YGW2R0z0/+A6YqzZNz2pkxH6fPdPqUcchYl0 clpYNEU/+Ylm/rxJ5UKXmiSDanCy3V8J3hiq9TAjbKFusrVucPf4ZZcRWu4s87lcTur461Hlk/W 73KMZ5wUR/Z7Qotpe/hp/StbvSzcmdmKCfwXyeFkjnvDwFfattEr62CcgV8WrUnDha60YAoSMLL n1BoHT9ZrnrMtgenwgk6k4a9EkbTD7rWOo8FPyZJJpS0MaSTxr67pT8pimfM8laRQDHlniLEnUG IT9DNcan50SSaApPAQdB3zKF/RIhQOCbxZtRm/f7sSrDeFNlYo1ISZT1pYIdVeZtN9yf13sc X-Proofpoint-ORIG-GUID: xQVlZkSdBk_Lu-zcMVqzzR1UneivKd3W X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-23_03,2025-07-23_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 mlxlogscore=997 lowpriorityscore=0 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 priorityscore=1501 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507230193 Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla 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 --- 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/dt= s/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 +#include +#include + +&apr { + compatible =3D "qcom,apr-v2"; + qcom,domain =3D ; + #address-cells =3D <1>; + #size-cells =3D <0>; + + q6core: service@3 { + compatible =3D "qcom,q6core"; + reg =3D ; + }; + + q6afe: service@4 { + compatible =3D "qcom,q6afe"; + reg =3D ; + qcom,protection-domain =3D "avs/audio", "msm/adsp/audio_pd"; + + q6afedai: dais { + compatible =3D "qcom,q6afe-dais"; + #address-cells =3D <1>; + #size-cells =3D <0>; + #sound-dai-cells =3D <1>; + }; + + q6afecc: clock-controller { + compatible =3D "qcom,q6afe-clocks"; + #clock-cells =3D <2>; + }; + + }; + + q6asm: service@7 { + compatible =3D "qcom,q6asm"; + reg =3D ; + qcom,protection-domain =3D "avs/audio", "msm/adsp/audio_pd"; + + q6asmdai: dais { + compatible =3D "qcom,q6asm-dais"; + #address-cells =3D <1>; + #size-cells =3D <0>; + #sound-dai-cells =3D <1>; + dai@0 { + reg =3D ; + }; + + dai@1 { + reg =3D ; + }; + + dai@2 { + reg =3D ; + }; + + dai@3 { + reg =3D ; + }; + + dai@5 { + reg =3D ; + }; + + dai@6 { + reg =3D ; + }; + }; + }; + + q6adm: service@8 { + compatible =3D "qcom,q6adm"; + reg =3D ; + qcom,protection-domain =3D "avs/audio", "msm/adsp/audio_pd"; + + q6routing: routing { + compatible =3D "qcom,q6adm-routing"; + #sound-dai-cells =3D <0>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sm8350-audio.dtsi b/arch/arm64/boot/d= ts/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 =3D <&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 @@ =20 #include #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/a= rch/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 @@ =20 #include #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 @@ =20 #include #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 #include #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/qco= m/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 =3D "lpass"; qcom,remote-pid =3D <2>; =20 - apr { - compatible =3D "qcom,apr-v2"; + apr: apr { qcom,glink-channels =3D "apr_audio_svc"; - qcom,domain =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - - service@3 { - reg =3D ; - compatible =3D "qcom,q6core"; - qcom,protection-domain =3D "avs/audio", "msm/adsp/audio_pd"; - }; - - q6afe: service@4 { - compatible =3D "qcom,q6afe"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", "msm/adsp/audio_pd"; - - q6afedai: dais { - compatible =3D "qcom,q6afe-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - }; - - q6afecc: clock-controller { - compatible =3D "qcom,q6afe-clocks"; - #clock-cells =3D <2>; - }; - }; - - q6asm: service@7 { - compatible =3D "qcom,q6asm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", "msm/adsp/audio_pd"; - - q6asmdai: dais { - compatible =3D "qcom,q6asm-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - iommus =3D <&apps_smmu 0x1801 0x0>; - - dai@0 { - reg =3D ; - }; - - dai@1 { - reg =3D ; - }; - - dai@2 { - reg =3D ; - }; - }; - }; - - q6adm: service@8 { - compatible =3D "qcom,q6adm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", "msm/adsp/audio_pd"; - - q6routing: routing { - compatible =3D "qcom,q6adm-routing"; - #sound-dai-cells =3D <0>; - }; - }; }; =20 fastrpc { --=20 2.50.0