From nobody Mon Oct 6 06:31:19 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 7E2CD2288C6 for ; Wed, 23 Jul 2025 22:27:53 +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=1753309675; cv=none; b=cmm0zLbzPQZwsIxAKF/E1tuB/CO0IaRKe4LESsg/dvCIXYD5Ecx6Yz3iPkCb4r2TV2iWJSzfwoAD/ww+vrlOq74HnfDwgkFhXaUfPfRUaGmu7M32Xi//ZweXzoigtlRM0Mvi9Vrc4CKc7nKCwm8ZPZ9+qfyGN9prqHTlyqlUFvA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309675; c=relaxed/simple; bh=9f0MWQGMt3kWf5M6K6kO0Cc5wE9p0DRpP3bTC8UxFa8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hi/c9+msBDAHyvXb5XoZ2SLI5GN/XAZ3qdJXFxDhScP4vyu/a8SlFx5QBJITeoLx5o0zAUvTtmdUmM/RFfIFN2HnGQce63HkLWj/iS4nivEPFL12Xe0pcg6kCza8JOaNE/9OBMHGBC4ZHnbrwK/jhr3skTM+nidTMAgifyGyRQE= 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=AT1EWGbw; 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="AT1EWGbw" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NGxoPs024516 for ; Wed, 23 Jul 2025 22:27:52 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=Lv1gwH4qM/M xiyZvly5IYByAhPppt71Gyj/KfZY9Y6w=; b=AT1EWGbwmHUZe82eIpcGumIowaO 5WUQRfMUyT9qI9KY1UMDzUAUb+b9DVUmG4tSLQ1tvG2BwCy5JxCZHpOtFw9PBsyv CCPn9ONlbHapU8Y1jG68afIACvNFAaGM5mb4YiwEj9WWC3g0Zu20O8WcInESEXSA D+axwAmhEj873DQh4rWlBHXq294wU2wdr9xt+xzwHC1KVe/YBoCGQQXhn+qa1tJ6 MoN2bc1FPFsm9RuELVYRNV0CUBBqUwGptQBmy1FZt6R1ExvVvsEGhidbXwjP8Y7y mzIkjNezWcRHMf2o4e+uWBKccv6OAZ3N/CnNGAHxuyCVjQyPCI20vpxFY7A== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 482b1ud914-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:27:52 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6facf4cf5e1so5892966d6.2 for ; Wed, 23 Jul 2025 15:27:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309671; x=1753914471; 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=Lv1gwH4qM/MxiyZvly5IYByAhPppt71Gyj/KfZY9Y6w=; b=bm/4HEnVxoshjJ5iw1IeMr+S4AgmiXGaVIjpNegcxmb/sVyinHkMJZwnobs4yfZti9 Rt/8oOH4hux23byxx5+kOBPUidZbUB7oTuYFEBAHfcuc/nytNatuPVYIFMTduERGiceK Ju9LPYm1AzoEFXj+p9r2iTm1clCDuzMxDmdVun6RQvzS+0u+NFtxnSL/ehC+UGArIf1I 5vLD0ZCuqBwWO/P1iWdJ4msWdBqT/vGMyYuYGBgPvrvBlbTSYwfhCwh/Xdt08hXjhEzT hwYhXPQvjzATyL9aWIel93vBmFvROk5efQ1IqB0EQDmBLFq/xvXoQSU8DKiBWFFt9/HK wN9g== X-Forwarded-Encrypted: i=1; AJvYcCU6Qfs60hfzgWGgo9uT7+rwPloef9iRC+svCpVz6y0lwJmEKmXQxsSEAMRrQK6XccAFqzMisAt9KzTtTSw=@vger.kernel.org X-Gm-Message-State: AOJu0Yytaj0/sgMysheEnokqgI3/E2zmPR2yhm4Nxikj8lXoPQ5KTMpZ N+cBs6awCtlZkyF8FWC/NJMrbJ+HEtRramAtxMYjA8d/LDMCSykpLUD0RUVxHQQylmpWXVDMciO 2hbu1nwrxCYUQf32JPpHuhFBiezQv6094lZnBi/VR0ncVVzG75cpgMJcE5NmwW1oFUn4= X-Gm-Gg: ASbGncvw3I3JhHybCcOtr4y4ADeRZgdsANzayf4f2afKisNYo6SXvdDmUgj36dk5FmJ +LfjUCM/+zf+TI4aI5DNUNZ7P6O5CK0CcdFJsUa9kYay4mNES3wlTDmGEGuteL6YnBeosZ8U49N 1cVgNYvTweFIoQkGNR079BtTLolVzP5GBWAPED/FsDmMSuQlxLN0Fr99M99cNRottpxw/t0tUAG mqyvwvpSoIS4MK5qdK7O6dZChRPe4ZwV9i5QAZDVfnaElAi6SP6UdnjBLz5JWtdGbJoW1QUk6Fi oai/8qWCQG155V61MZ4vKCDlDPoJzUYzlLjttm6P4n6Svhtbv3jdUw== X-Received: by 2002:a05:6214:27c7:b0:704:f952:3d66 with SMTP id 6a1803df08f44-707006a3e74mr56005426d6.47.1753309671040; Wed, 23 Jul 2025 15:27:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHk6k7H/DKZ6RoAa/iFffbLEugNjCZjM21SKc3RSw1fAYe9HXKUtDzJ+0og7urmcPaOs6vudg== X-Received: by 2002:a05:6214:27c7:b0:704:f952:3d66 with SMTP id 6a1803df08f44-707006a3e74mr56005156d6.47.1753309670593; Wed, 23 Jul 2025 15:27:50 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.27.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:27:49 -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 01/23] arm64: dts: qcom: x1e80100: move dsp audio nodes to dedicated dts Date: Wed, 23 Jul 2025 23:27:15 +0100 Message-ID: <20250723222737.35561-2-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-Authority-Analysis: v=2.4 cv=LdY86ifi c=1 sm=1 tr=0 ts=688161e8 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=ETe8z7BbGz-F56Y7HIQA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfXy/6X7Ui+z1dL 03WI29b3Ciu1LTQVGDsVdC/z/uIe7eCSHbCeuhOqVIconXB2skOWg95niDB45WEokXGvxzGFs1g BFeZd4bUDPYqlIjnKEECx54Pk/vF1jLNYkd3v2WpETbPdIJ1PlATxqgB6CZyrZhZcHHv0S4fDEW 0YJtcmaRd5lApujPc3/Y0AvYmsq+ygyjxScmc+uzwpv5DZ2ev/eeJGai61Qk+tvi9oQtdZ7xu+I yxyonJq55LM2LnM45cqUaI/UiwO3vu31ZtXUPcCHnzA7WfghExYwQPK21/uGsF8r+y6iVyox09e YP9ADHfUK+iAEEkjtjabPyNIxCX0LDW31zdJofqVMJAuLmruIrnomwtcBi2u8BEp7QkOPdPCiUp JwC2B7jARVTIevU2PGTuyYF/RHfayAFUPrQZT0d55kvFeEqLHeBASDT8Vckk6UXIDbr05LoR X-Proofpoint-ORIG-GUID: k-xKes1vl8sFcVnSXseEsSJXGgc8zFRB X-Proofpoint-GUID: k-xKes1vl8sFcVnSXseEsSJXGgc8zFRB 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 mlxscore=0 priorityscore=1501 adultscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 suspectscore=0 clxscore=1015 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 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 --- .../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/bo= ot/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 +#include + +&gpr { + compatible =3D "qcom,gpr"; + qcom,glink-channels =3D "adsp_apps"; + qcom,domain =3D ; + qcom,intents =3D <512 20>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + q6apm: service@1 { + compatible =3D "qcom,q6apm"; + reg =3D ; + #sound-dai-cells =3D <0>; + qcom,protection-domain =3D "avs/audio", + "msm/adsp/audio_pd"; + + q6apmbedai: bedais { + compatible =3D "qcom,q6apm-lpass-dais"; + #sound-dai-cells =3D <1>; + }; + + q6apmdai: dais { + compatible =3D "qcom,q6apm-dais"; + }; + }; + + q6prm: service@2 { + compatible =3D "qcom,q6prm"; + reg =3D ; + qcom,protection-domain =3D "avs/audio", + "msm/adsp/audio_pd"; + + q6prmcc: clock-controller { + compatible =3D "qcom,q6prm-lpass-clocks"; + #clock-cells =3D <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 #include =20 +#include "x1e80100-audio.dtsi" #include "x1e80100-pmics.dtsi" =20 / { diff --git a/arch/arm64/boot/dts/qcom/x1-crd.dtsi b/arch/arm64/boot/dts/qco= m/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 #include =20 +#include "x1e80100-audio.dtsi" #include "x1e80100-pmics.dtsi" =20 / { 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 @@ =20 #include "x1e80100.dtsi" #include "x1e80100-pmics.dtsi" +#include "x1e80100-audio.dtsi" =20 / { model =3D "Qualcomm Technologies, Inc. X1E001DE Snapdragon Devkit for Win= dows"; 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 =20 #include "x1e80100.dtsi" +#include "x1e80100-audio.dtsi" #include "x1e80100-pmics.dtsi" =20 / { 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 @@ =20 #include "x1e80100.dtsi" #include "x1e80100-pmics.dtsi" +#include "x1e80100-audio.dtsi" =20 / { model =3D "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 =3D <&apps_smmu 0x1001 0x80>, + <&apps_smmu 0x1061 0x0>; +}; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts b/arch/a= rm64/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 @@ =20 #include "x1e80100.dtsi" #include "x1e80100-pmics.dtsi" +#include "x1e80100-audio.dtsi" =20 / { model =3D "Dell XPS 13 9345"; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts b/arch/a= rm64/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 @@ =20 #include "x1e80100.dtsi" #include "x1e80100-pmics.dtsi" +#include "x1e80100-audio.dtsi" =20 / { model =3D "HP Omnibook X 14"; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arc= h/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 @@ =20 #include "x1e80100.dtsi" #include "x1e80100-pmics.dtsi" +#include "x1e80100-audio.dtsi" =20 / { model =3D "Lenovo Yoga Slim 7x"; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arc= h/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 @@ =20 #include "x1e80100.dtsi" #include "x1e80100-pmics.dtsi" +#include "x1e80100-audio.dtsi" =20 / { aliases { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dt= s/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 @@ =20 #include "x1e80100.dtsi" #include "x1e80100-pmics.dtsi" +#include "x1e80100-audio.dtsi" =20 / { model =3D "Qualcomm Technologies, Inc. X1E80100 QCP"; diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/q= com/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 #include #include -#include #include #include #include @@ -4041,6 +4040,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP label =3D "lpass"; qcom,remote-pid =3D <2>; =20 + gpr: gpr { + }; + fastrpc { compatible =3D "qcom,fastrpc"; qcom,glink-channels =3D "fastrpcglink-apps-dsp"; @@ -4090,45 +4092,6 @@ compute-cb@7 { }; }; =20 - gpr { - compatible =3D "qcom,gpr"; - qcom,glink-channels =3D "adsp_apps"; - qcom,domain =3D ; - qcom,intents =3D <512 20>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - q6apm: service@1 { - compatible =3D "qcom,q6apm"; - reg =3D ; - #sound-dai-cells =3D <0>; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6apmbedai: bedais { - compatible =3D "qcom,q6apm-lpass-dais"; - #sound-dai-cells =3D <1>; - }; - - q6apmdai: dais { - compatible =3D "qcom,q6apm-dais"; - iommus =3D <&apps_smmu 0x1001 0x80>, - <&apps_smmu 0x1061 0x0>; - }; - }; - - q6prm: service@2 { - compatible =3D "qcom,q6prm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6prmcc: clock-controller { - compatible =3D "qcom,q6prm-lpass-clocks"; - #clock-cells =3D <2>; - }; - }; - }; }; }; =20 --=20 2.50.0 From nobody Mon Oct 6 06:31:19 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 0D5442737EF for ; Wed, 23 Jul 2025 22:27:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309677; cv=none; b=crKraixuFEMp2W0mwj1gLwbSW1pGSdiclxMHDZPbFhYwAiOKp3PgHdgdnyMKOLePWiuBudKFHPYQvvO6dIGE4d0kzKqpyBh9T5ZMkpvQsbQwLRmCobYXTcQop49pFClk+c8ZHshaUcYZ55oO9M/gG79iUZXmqthhP486yNfpPow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309677; c=relaxed/simple; bh=YekXTtpbtuPJQY9K+KBFkkK1WamERekkK3YWA2mwRYM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cky+R16vxOYwkMa2JfkiLAJQ6Dn+ZiW5pU0VMBwLGtHpJwEbtc4Ctz8WHCo1N4LdtwWEsIg3bc6QpZ4X4weMVuSC4TH5wCN2y4OKMlentcRHmcFPdrlGZzUvnE3ve6qV6QKO9zyGcaW/pAZXU9zXu8IDovSzWPPbv+y0kmT3/zw= 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=oPPQAae8; arc=none smtp.client-ip=205.220.180.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="oPPQAae8" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHXD8w024777 for ; Wed, 23 Jul 2025 22:27:54 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=FxhSae4TrGK 2oc0rm+K4hgmPsozVGBAQ65/QJBrDpcQ=; b=oPPQAae84/SClWg3K9sRM2gl54X +3UFZaCI7lpt2gO26LyGofaRMpaAGGXRJoeW4e1DH8n3kXbKDkGsHhvUS46FVMuC yyQm91oO0qe3z7nuGxtRzwFuSkfa63Iu0keqk9d8jiUk75pgEEK6AKg6CgOMhQOb SnvSjUAgPPPMk96cUPQx95qi1AwvcHUomf3sIadgVXI1IRhhT7nLUCp6XRG6D5ox cpcfxQT+ZRgoESR4Q/m/zgZAAMrZ1AkT5Y5+DcTyaS0LLAH5/GFc4bdM5BShhOeA QyK4/+mqNyb/1Efk3nEZVy8jejg3HCkG/eF8IKqqSlkEnhUhxUWL2SPR9Ww== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48044dpgac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:27:53 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7e1fb57a7adso28288885a.2 for ; Wed, 23 Jul 2025 15:27:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309673; x=1753914473; 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=FxhSae4TrGK2oc0rm+K4hgmPsozVGBAQ65/QJBrDpcQ=; b=qKJDKBGRUA/l2cQFwIhUzbfWd6kvtcqOzambZmOP5X84pQLZBVEPc2bU+CF3BIBG7g f0aAHpGZazu3trGvy7poifdc4K97THqwkNnyd6yxlF2jPopjviMIuMANXQDKwEc1MIDg bmI0iZcvE5O3SKDGzIoWmDB9suPp53rjv4+RkvzLs7A54C5wjulSZV0SNmb5YTGl7HfD 9gHABoffesk7667uNCOmPlBr4gVE6bGCDA3u1t6vUFVIPRYBgYtIv4pt91PyxWfXswJi VwWoK16Vdo0eMbHPEdeXLzy4a578lAd9oxzvN1OKsZ0brfOJ6/WNdIY3b+8VGT+mj0K5 mMQw== X-Forwarded-Encrypted: i=1; AJvYcCWZiIwAOiSbQ5YzcP4UECj8vDa0xtMFndaBatkGybytoPW807PuJe8xlCpkts5FxGQzzklCemuBm5fue3c=@vger.kernel.org X-Gm-Message-State: AOJu0YyIR0bDZeYZHt9M2K05lYGov6eAa6ZVS62bCuUMR4bB2B6cLmm1 P2B6mZiJ2ZFGB98BBEygsddUtYUR3QYVBc2RUif29n515jO7IqRDi/HUDRGPqMcgO09ejMdpUvV V8NCPtL36gmY6vkfGfcvnTO/EYhye1A7kUtQyYEeDBC2Zd1Ptl8PcZY1hHlB471C7etI= X-Gm-Gg: ASbGnctV2BOs9Q5PJ5oKBGoh4J8txJiiWtaM213PEx8a7z2zURzv0nGCkj3uRnG/a1I w5I6zoNPdgOD/BuY9ieT4tWW+WBb1uDxIjuEOSJtZs+Tw4SJkTAo0d0Pn6QY/DAPDaXkFNyP+hV 6nu05GwBl4s2SY0TpLkQvqSZ5Sz2CsUGMttGztKDN2KBm5ITvQPz+ROAm8B5WxqSZ3lJxS6XlGK mbV9uaD1fAqed23U756oiRs/9TFnVMpno7KWfEqKbDoyVw8T4LU9Y9q3r0zw+e7oxH1ryfIXJHJ ILsS0xpNRevun3854dumaEFtyuCSXX2sdP1yigyDjnFR01PT7fksEg== X-Received: by 2002:a05:620a:a904:b0:7e1:3b7d:d12b with SMTP id af79cd13be357-7e62a098a20mr559031385a.6.1753309672764; Wed, 23 Jul 2025 15:27:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFKfc+CwTTko7PUDzzAEjFO/NLsQQpngUiYCJzqO3J/i7v0N/CccseGLon4AiUWc+ryJm0oA== X-Received: by 2002:a05:620a:a904:b0:7e1:3b7d:d12b with SMTP id af79cd13be357-7e62a098a20mr559028885a.6.1753309672300; Wed, 23 Jul 2025 15:27:52 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:27:51 -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 02/23] arm64: dts: qcom: sc8280xp: use dedicated audioreach dtsi Date: Wed, 23 Jul 2025 23:27:16 +0100 Message-ID: <20250723222737.35561-3-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-Authority-Analysis: v=2.4 cv=BJ6zrEQG c=1 sm=1 tr=0 ts=688161e9 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=-ddZ981MevGtOgwbEi0A:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-GUID: TYBKyDuZeSvQ2HpoqwCIVrr4oQPyKtZY X-Proofpoint-ORIG-GUID: TYBKyDuZeSvQ2HpoqwCIVrr4oQPyKtZY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX8wlI0RjVcPW8 Ud+SeFstDXbq9651s7bvirXYTwu18i2S0yc/iyP5v4TVxKQPX3NtzFzmARtSk2thT5H8BBgLiKI sPFg7obnPA7GGo/SzI2eCsbDlgNGmZM0X8wDQ2K+6KKzV90z3roxgMPGb/Wp/b/K8xqRlDvpk2K d45UOfvutS43AXwDtIuJiDDrXjLdGIfaTLfJsL37LQ5tjoAbL7VlT3T/dm2ef3M/rPq1IHowzAK 6UpLudayNTO8n/9Fi+JfUYGdETUKS29jT8fhdIBX4mxN19OdptS61RmJj+M/ZA6pPdyvn1gfkY8 SuELy/azBo4g/GixcXKmhP0L/e8KDvNfz0R1f/R/bt8qVb7QBUETdgMMG3lK4QWyGPjE+vj/mwC 1c1cr8I/r+ACUdXHVBRhxqLf+b3qiW4UU6m5ksdO13ttRuS6kaYY969l5G37IB/9qj0HOxh6 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 priorityscore=1501 lowpriorityscore=0 clxscore=1015 spamscore=0 mlxlogscore=754 suspectscore=0 impostorscore=0 phishscore=0 adultscore=0 mlxscore=0 malwarescore=0 bulkscore=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 Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/qc= om/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 @@ */ =20 #include "sc8280xp.dtsi" +#include "sc8280xp-audio.dtsi" =20 /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 =3D <&apps_smmu 0x0c01 0x0>; +}; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dt= s/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 =20 #include "sc8280xp.dtsi" +#include "sc8280xp-audio.dtsi" #include "sc8280xp-pmics.dtsi" =20 / { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/ar= m64/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 =20 #include "sc8280xp.dtsi" +#include "sc8280xp-audio.dtsi" #include "sc8280xp-pmics.dtsi" =20 / { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/a= rch/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 =20 #include "sc8280xp.dtsi" +#include "sc8280xp-audio.dtsi" #include "sc8280xp-pmics.dtsi" =20 / { 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 =20 #include "sc8280xp.dtsi" +#include "sc8280xp-audio.dtsi" #include "sc8280xp-pmics.dtsi" =20 / { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/ar= ch/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 =20 #include "sc8280xp.dtsi" +#include "sc8280xp-audio.dtsi" #include "sc8280xp-pmics.dtsi" =20 / { diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/q= com/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 #include #include -#include #include #include #include @@ -2592,42 +2591,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP label =3D "lpass"; qcom,remote-pid =3D <2>; =20 - gpr { - compatible =3D "qcom,gpr"; - qcom,glink-channels =3D "adsp_apps"; - qcom,domain =3D ; - qcom,intents =3D <512 20>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - q6apm: service@1 { - compatible =3D "qcom,q6apm"; - reg =3D ; - #sound-dai-cells =3D <0>; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - q6apmdai: dais { - compatible =3D "qcom,q6apm-dais"; - iommus =3D <&apps_smmu 0x0c01 0x0>; - }; - - q6apmbedai: bedais { - compatible =3D "qcom,q6apm-lpass-dais"; - #sound-dai-cells =3D <1>; - }; - }; - - q6prm: service@2 { - compatible =3D "qcom,q6prm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - q6prmcc: clock-controller { - compatible =3D "qcom,q6prm-lpass-clocks"; - #clock-cells =3D <2>; - }; - }; + gpr: gpr { }; + }; }; =20 --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 07ABB27380A for ; Wed, 23 Jul 2025 22:27:56 +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=1753309678; cv=none; b=rUE+DKwT1At8BQ6G5dRANR4APJ9uimNdbRb9ksTl/X1sj+GPAguo43lkjp5ZKeL/4iJAySDwx7qQBh856tvQupg7Hqn2EXJKLtQAfv8LVbQF/KuC0ZkVFxfHUTSW7CEc6f01Gfav17Mt0OPYstrOtOBqMzIj8cLdIMRIL9sGDwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309678; c=relaxed/simple; bh=8gdDskS87FeNg6keyQeGdaNSZnQdQZayup5VAf9Jiwk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qcVp4H5dRuMirMsat0gdz4q68xTYMwSB4ip6J99DhhLQLSWdMYm8OD8w+ZtE/svUPRtUNnFCn91JRDFNVNePN4T3rcpHqIuwN+U4Uhae1fwgkBk6w86wnG3Sa4nwlUTsi+BCNI2QQbDz3gEHeiw1mqjRIhJeHKZ0FtsA4jAw5hI= 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=oLwJUEwe; 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="oLwJUEwe" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NGxBbv004853 for ; Wed, 23 Jul 2025 22:27:56 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=7RK0fhLMbvn Gy9dQv4qEXj2wBB+KjlP+zFlUnmCUSRg=; b=oLwJUEweVWKKGKcr2drqVXbxA9L 4kCuBpkIHnleEAXvWm/SS2lLIpxl6z03D6f8lOqsWwatroonMoOjsE/Gxfnuih1+ DeSZ5XH1RUR4LyYdDa2I+yTJ01F110pZsfZKvJFLXTNatKeGUQNUy1QTglOaO0GW llBxAU1wK8/GRpusHTaEUA7E/jv8JVPoVH67tMbBIl9wEYbt5Wm6/va5KUJjMWp5 tw5DTqseneh/y0uk2kWgjYK+ElSrWzWbQ05TXyW7ySP3fb/sBgoTCe7TRRTuGxpB Pw0iezKzyTcrPgxMKfmEC6jkF7b9Lnw6xjfqL9p3FBwGAGw5hHUeu48Qj4Q== 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 481t6w7uts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:27:56 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6fb3bb94b5cso5261356d6.2 for ; Wed, 23 Jul 2025 15:27:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309675; x=1753914475; 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=7RK0fhLMbvnGy9dQv4qEXj2wBB+KjlP+zFlUnmCUSRg=; b=OLKKxRv2ec/MTfAp067BREpw+r2lDssOEV5g1eVohczIi8pJZ5GmROvdUDgOn4FgWR 24FDgJ5nb2jppJC6gx9KsTYFl7iC+nNUCMNhmjLLfjRBthaEN7tCb5QV1T/Vhc/rD+uN TsBkPGzwwNpggrpgseS0bDj8v6HmR6v8hSwUUEOXpIPAZ33r6UHIDxu3xV3CH3nopz7B r6E/z+74jVLvVsfSrPRdzIXHxpu52i+ao8tq+I8XHpt1tqoPeRWNZ9BxsMp9MNKi6nMP byvyCUOV9HNkuQQvRViw27OPba4hI7dlAUYwqTBOvwhr+X8PG9Wi8LhELxJQLGsklNwU tIbg== X-Forwarded-Encrypted: i=1; AJvYcCXdy8rf9lQogaJcNJPtymRQNwAmftAWX9xF51LDGONzRLQhVJkIq4UkrjL5bUP6C1XbcHMb950I5h32g50=@vger.kernel.org X-Gm-Message-State: AOJu0YwL09mKc/t8quZo/J/on8DnR3nJOVV9TxYC3w84zfc1wpZGKAaf bH7H8TitsRiCAJAmysPXQ7HToN0S5fcLe2c7FtYpRjSqR7CiukvsNrWTGieYiti/ENSMCZ/vUqz VDN9xGB2RhN/qzhcQQ1gHjyb1dfsygkknTaXjjEz16WazYeXviRTWcWrx2H+5eNwBu04= X-Gm-Gg: ASbGncv2XpRjPxRRgyfLGfCEmUzSOvnHYSBQ/ukScvLir6Ut8f+nBY8hzqOzM4cDCLa 3ThpOfXsA893O4lYI0l1kDqY3PWI1uLVIdza926zPvMTn4dRWVEeWzRKn0kkuSk0u9jYnCivsTg gtMB6SUVFWcWGQwB+8CbA/d/X7HMd+qlIeEYGUcT6mEjsoxT7GkiYUYnf5hCKqMb/9xnL3yKGoO VQR7gkBWzHp9/tHnOT9zmJpdSng3ww9ue0LprhL/tIneztrVMmJfh3FwktS+myLr4X+v45Cc24y Wmm/tnrN3Hw9AneQWv67ZdJbYXcQ/vpxxTlJbcFS7E+Wa866pHLScg== X-Received: by 2002:ad4:5aae:0:b0:704:f3ef:cbc2 with SMTP id 6a1803df08f44-707006800c0mr56091686d6.33.1753309674686; Wed, 23 Jul 2025 15:27:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHi+F19FWgptWCgQfI9EqZuj1NHc7/nYLG8611pLkfjbTVjEsycI1TSpNLO1Dn9kYVM+a78uw== X-Received: by 2002:ad4:5aae:0:b0:704:f3ef:cbc2 with SMTP id 6a1803df08f44-707006800c0mr56091346d6.33.1753309674109; Wed, 23 Jul 2025 15:27:54 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:27:52 -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 03/23] arm64: dts: qcom: sm8650: use dedicated audioreach dtsi Date: Wed, 23 Jul 2025 23:27:17 +0100 Message-ID: <20250723222737.35561-4-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-Authority-Analysis: v=2.4 cv=SPpCVPvH c=1 sm=1 tr=0 ts=688161ec cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=aONcyR_MLncd44ar4gMA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX7LKkNvxapjjy Iz1QSixKFJynItAzTChNkBH+1fo5Dlz5RqXcKoXO+RnryvRZh7abRcTghH1hH8FShUhWahMw/cA bbbf/YPhDFAqorMaqWyJHX06lHEh4Zj5Y9ge051TP0abKnCyOLAWRr+jmmMuuNBfXdwDAvX8EOV XAeqroEwzGKfO9wkwc0iMHX3m09J57RY6VRGIuUmiJACF4aC90vCcVGrwVVVcFYjHN9a6T+l9ED 141J3i5SuFn9K8sAZLXPyUpGqkYGbZFsRwWBrXj+Ia05xfFtSe7s7WTy74i0RcxO9MFRH52aWr1 jZuDhpAdhZQe/QkNhyzemJtCcQZLPlNvQcDl2zmjReeIeH/boL0BYWUlElv1ZC8/YJ6GUWZK9Nz FBsrKxMchxpJVXU9Nx/SqLSq2BMBJzcN8TKaTfLKfV6TiO4ALA0ohnzz2gpzlwIM4nLe3A7L X-Proofpoint-ORIG-GUID: h5791Camn4E_FtarHr6xaYMqkIo4LGGd X-Proofpoint-GUID: h5791Camn4E_FtarHr6xaYMqkIo4LGGd 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 spamscore=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 lowpriorityscore=0 mlxlogscore=739 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 Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/d= ts/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 =3D <&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 #include #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 @@ =20 #include #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 #include #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/qco= m/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 #include #include -#include #include #include #include @@ -4447,6 +4446,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP =20 label =3D "lpass"; =20 + gpr: gpr { + }; + fastrpc { compatible =3D "qcom,fastrpc"; =20 @@ -4506,45 +4508,6 @@ compute-cb@7 { }; }; =20 - gpr { - compatible =3D "qcom,gpr"; - qcom,glink-channels =3D "adsp_apps"; - qcom,domain =3D ; - qcom,intents =3D <512 20>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - q6apm: service@1 { - compatible =3D "qcom,q6apm"; - reg =3D ; - #sound-dai-cells =3D <0>; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6apmbedai: bedais { - compatible =3D "qcom,q6apm-lpass-dais"; - #sound-dai-cells =3D <1>; - }; - - q6apmdai: dais { - compatible =3D "qcom,q6apm-dais"; - iommus =3D <&apps_smmu 0x1001 0x80>, - <&apps_smmu 0x1061 0x0>; - }; - }; - - q6prm: service@2 { - compatible =3D "qcom,q6prm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6prmcc: clock-controller { - compatible =3D "qcom,q6prm-lpass-clocks"; - #clock-cells =3D <2>; - }; - }; - }; }; }; =20 --=20 2.50.0 From nobody Mon Oct 6 06:31:19 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 66CA1273D71 for ; Wed, 23 Jul 2025 22:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309680; cv=none; b=DvHvq1wsxwaGcWaDTxN8DczVfF4n2CX6k7mv9iIRrgh0ALT5QP/Y+nu8YIP91VoHKtwDksiVUckmu1srZgd5U4mOhTDZwDweYZ1+5+un9L1Ptnc/dc7vVk5Y/JAEFsaRM53zvYhD04TLoCuJ3UgxePOiA0EB6VAmswQq0yn59yc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309680; c=relaxed/simple; bh=pvf9JF7jjZfMEX1LsRfCZnTjM3hSxhl1Eal1wQ6AyDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D4NAxWfNab13g4R7Het0CyswbZ+1EkS8QlWiQI6Pzt4vtDKeTfCTjx/AhJh66ANxp5LwcgDPiHGFCGk0ZCAJQQ8F/PXcEhpnLODl90X9gyJWkPNWnu0BfQBc8k8s+xjNxoWDHAIRqtfSEs4rhEAufxl4xgX9FzFgK+no6SJvWk0= 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=C8OXm6jX; arc=none smtp.client-ip=205.220.180.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="C8OXm6jX" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHrdHC032272 for ; Wed, 23 Jul 2025 22:27:57 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=rGjVOGGinto CGY8gtHt3SxU3lDJJ/TxmoFuDubqT8pw=; b=C8OXm6jXBVJheqfFrBZJHRY7Cn2 xVsEejRTwvcKgKO4Avic8ITYUQl6X4pNnpEQVo3RePrFi4YFHTZQPI9alj6eGXSA vE4p3R5OXcGFxfcOt11u82W9GHOFM8pP/7NNpK/x9qF8269Nu4pGIpHi3oI0lnW6 AaxTri5yJKwinxDDyFWHd6pYx93tcokielYuci/d4wyzszdsVugxdVX5NYimc1Pr PeZq1huDOdz+ykWEs7+SNi1O8dX3+tX8rdbW6ak06wCFuuaNlipat5EbQ9Un26JL OJvGCYh/5BR6RgJ2ID8dNKQS/wpLJFVc6FItgkO1v9Ga3I1idI45Tz/d+3w== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4826t1e12n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:27:57 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7e3452c060eso31093985a.1 for ; Wed, 23 Jul 2025 15:27:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309676; x=1753914476; 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=rGjVOGGintoCGY8gtHt3SxU3lDJJ/TxmoFuDubqT8pw=; b=kKeMj7cD82vWDLHOV2Jq1OVrTmPmuBe/YI3CBXwjtUAxJ8x5G/DipT4u1CtLoj1gOk S4vx+Tyj9dQdS7tR2sB6q4+KDd2eo06z+EkQkx2I98RhzQa3PATv2aQ8NFOaUDxUjN7L mzrHi3/7pn5luHlWVxKJ7+2BnqNRpDrVOaZAq/BiMLak2/ESaHmokGhGGFKRsxIzKRqn yf8JDlNjuUVvfxM14K+LNf3qptWTHhAkUA+f0qQGNmn4WB4c/hT+mObjbeXMnP8gMH2E hnQwNSe30lxggK5O0Ky1j+9wTHh2E0nGe4prLvaIwhNC1XztzQaASQik6/kuN6NuRwqI yA4g== X-Forwarded-Encrypted: i=1; AJvYcCX43cpOiBlXQvAg4cf/utrvq+PL5WY5hl6kGwayjUn3aiTCP1H/PBvXO95XJM0R7ZjQD2hB2XQJduQbKvI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3kwYz/IVtYN95OOfOrdm6eUxfVK37iMBAqsjNApphxcO1JFGZ I/JAzGrDTK6D/rhPkgLeDdDzS25Rm8ENrKbTr/noQl7x8Pa+dOY85KyFs7UJ3W5B9jk/aR9a1Nl 9SiWspKmen1CBiXPMyXZDeCrbFU5tTNa/1LEPT8dRhDpGz0sJ2KWyry8A6OCicVmRmzM= X-Gm-Gg: ASbGncvTSz8oOKSVv/pwFF09+MqYeMHw79CScbvfGCuNGwsNMz8YaR0SFAOSvCJTPdq u2x04rYvAciqF0nl+4lBHos/GmGenv5sZnO5giYI2hA55Vwxp0hfbSKB7jYZQGvVtf2RbaahA94 ykY+y3sRVSpPLlHpUtNT7QVv/jupM9CWTtPs3N3R9Brdf0SCBNACfYh0u7KA4/HOsBZoYxEsQnW n0tKIPEK3PdyL/H81ktuYvYQjLN3EKvOk2Yvj7H+Q6P/zWJyVRnyDUm7m4VYqL2u3fS8LntVkPq K54V+MJOH0Uk2aH0OxoKfNB8fIYfW2ImCzTwczpRg1inb7lghjfdKA== X-Received: by 2002:a05:620a:a214:b0:7e3:4014:f322 with SMTP id af79cd13be357-7e62a15a1dcmr550437185a.31.1753309676348; Wed, 23 Jul 2025 15:27:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF9/popm4R1FR3yrQuWg7/603rsZW/SNKsaARZFwMy/ev531tGkN4vqxS1mQt3rOFlyoBAujg== X-Received: by 2002:a05:620a:a214:b0:7e3:4014:f322 with SMTP id af79cd13be357-7e62a15a1dcmr550434785a.31.1753309675933; Wed, 23 Jul 2025 15:27:55 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.27.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:27:54 -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 04/23] arm64: dts: qcom: sm8550: use dedicated audioreach dtsi Date: Wed, 23 Jul 2025 23:27:18 +0100 Message-ID: <20250723222737.35561-5-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: sgMnkhXHt6eQvqYdB356lSfQswb2MOQt X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MiBTYWx0ZWRfX4RQFMFAT/WvD da0M8hdEPDTWAunxnEumvmQ4ZH8smO5BtQUgJoYiEtSpj3OcEYuNbD5TUiNMFYO3hz35Vfm6F0P QzwqkvT9BNq7uzse8pXwSZQcArxEAnqD72sV0Q8yRiacLwuvS1RncPtaAn7hCiS8yn3Ry2l5iLh ACveP5tJFzsAsuUMMGPkBf6cFnjbxVjp4Y0z8Pgbvwrmep4jskLwFfzgQQ54qGLVxaGDtx5wk7W XklShfeKNDY8s9Vv+Axzh+4jC0mieCGsb/LtMP63W9+ZPOgn1XeWjmoJNj/Iui5WRaFtWOHwEOX 8qMeo4bMW9JwnNWkwQ2Mk1uumrNyVwovJm6XLTtte++W67gKDIWyUeXKroHeYdvGQVQARyQLVLR 8IOU8z4vcnW6+3ry3dRNPiIFRsqJqURw5YNnqZfD9lA5LuR4+fFB4LYrh9DDYDHepdvs0/iT X-Authority-Analysis: v=2.4 cv=E8/Npbdl c=1 sm=1 tr=0 ts=688161ed cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=-ddZ981MevGtOgwbEi0A:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: sgMnkhXHt6eQvqYdB356lSfQswb2MOQt 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 malwarescore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 suspectscore=0 clxscore=1015 phishscore=0 mlxlogscore=540 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507230192 Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/qc= om/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 @@ */ =20 #include "sm8550.dtsi" +#include "sm8550-audio.dtsi" =20 /delete-node/ &reserved_memory; =20 diff --git a/arch/arm64/boot/dts/qcom/sm8550-audio.dtsi b/arch/arm64/boot/d= ts/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 =3D <&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 #include #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 @@ =20 #include #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 #include #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/b= oot/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 #include #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 #include #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/qco= m/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 #include #include -#include #include #include #include @@ -2746,6 +2745,9 @@ IPCC_MPROC_SIGNAL_GLINK_QMP label =3D "lpass"; qcom,remote-pid =3D <2>; =20 + gpr: gpr { + }; + fastrpc { compatible =3D "qcom,fastrpc"; qcom,glink-channels =3D "fastrpcglink-apps-dsp"; @@ -2794,46 +2796,6 @@ compute-cb@7 { dma-coherent; }; }; - - gpr { - compatible =3D "qcom,gpr"; - qcom,glink-channels =3D "adsp_apps"; - qcom,domain =3D ; - qcom,intents =3D <512 20>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - q6apm: service@1 { - compatible =3D "qcom,q6apm"; - reg =3D ; - #sound-dai-cells =3D <0>; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6apmdai: dais { - compatible =3D "qcom,q6apm-dais"; - iommus =3D <&apps_smmu 0x1001 0x80>, - <&apps_smmu 0x1061 0x0>; - }; - - q6apmbedai: bedais { - compatible =3D "qcom,q6apm-lpass-dais"; - #sound-dai-cells =3D <1>; - }; - }; - - q6prm: service@2 { - compatible =3D "qcom,q6prm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6prmcc: clock-controller { - compatible =3D "qcom,q6prm-lpass-clocks"; - #clock-cells =3D <2>; - }; - }; - }; }; }; =20 --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 5BAAF273D9F for ; Wed, 23 Jul 2025 22:27:59 +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=1753309681; cv=none; b=q11T8RK+Rs2+T/J0tHWjKBHrfI6lrXTVwGUqXSFsX/I8Zu1nece7hs/M55WVxQL5HnA+uc3Vw4KpZU9KFnJfo8FqldpxP+XyaS69xlKsENYlClsA8dB+3HCbfpdCbhEhUJ7YmgTpzYkdkAniLF1b8T1c+gidKVD/2biIvz2/wX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309681; c=relaxed/simple; bh=8sJ2i/TalucOlRVRq59ieDmM0h01/bZurJGh4IDevg8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DnVlcUa5QBndRqoKJkBsuMxwuUMcECBOeKW0AvNWsCp3ET7CYQ1UFrBdmY2WWbiPGNbnLyf2Sa5DgsKcQj5iLzxXnXWva8CSiLY/hR79hZ957aoXg4FEhu62RBJCevESxVQxm7NrXMQowHLsvhhYwsC2SS2f6zDSIhDY1wpHPso= 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=n/OG39x5; 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="n/OG39x5" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHBuN9009270 for ; Wed, 23 Jul 2025 22:27:58 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=oV7AIIt1QyA o8wPjxuzZpCSCbMZcDPvWD/2IfvRI0Z8=; b=n/OG39x5A+gfLLtVc8AWV5IZyD3 1v8dc5s3z+0JFWF+5nRq2uEyeZ2+l63vSVji6DBEkx+T9hG7/Ftn1qGiy5AmAC2f JmnEc6te/1F7V/qixBXEV1Y029XfK1aM730diud/IAZnzQCHtj5e8eu/cs9DBxAn +4A7f6tN6hQjagvxmIzzDYBBuz5J9R2SLiYtVSG8/Ycw7RI3h90nAxF5ungLkS35 xGny8HZxTPxdFYTHcYlBDVKqi9j+2Q5wQd5fV1EYdIcjnOr8JRyOZ1YNfc3WsNuv Ttd0Owi/6fmRdAP0t5erp85U2hgdAkXrYK1T5n+377aC/j+iLOWsopgkm+g== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4804na5533-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:27:58 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c5bb68b386so124881785a.3 for ; Wed, 23 Jul 2025 15:27:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309677; x=1753914477; 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=oV7AIIt1QyAo8wPjxuzZpCSCbMZcDPvWD/2IfvRI0Z8=; b=UeFwQNwqglLCyzzvYcwZwsvRRBS45mxMQRSuS8bIjsRUNUR296rdMSr/0935Hh4+Fx 6A85l748pSdoB8DGHJ1pTA+NfnnmySJoPawv8g13g1YKGZp6WVcbPFvU/g5gsYRmDPpE bhyExyi2lVHBQW1WgxnwUHUA71l+MwiIzf4K3jg0NSuOcjjTvbg5loivKtq8q8JRwl8y 5MbMLfoey7BCSbcUmIuU8+Sa4Gcxl4FBKUoyZPs1DlNcWhxhgiYNP1txtMgfLPZg9FTP rC+OdwGgeQ9dUjeRdDAiyyit5tNLFzmki9wyViw5SlSVmkqEu5aIJyoTJ/IAcvbKxhub 9Wbw== X-Forwarded-Encrypted: i=1; AJvYcCU5W8Ca4t21TEkPkEXKN6+YX4mc/+DkW+FvwLEUHNrYhOdt/V7frPENUeAjnh59nix1iGTv5gpw8GxfHXE=@vger.kernel.org X-Gm-Message-State: AOJu0YxeN/FBOIE0tvL1yQwWYZ3HHYXL2GsZPcF9+/ol/+Npx2WTxp1m c39PsugWwn1GxFIDQrRXqi5YIJqp+Ds6UPALZJau3V/tpLfX+NoHrdKma/p5+CB1f+YdOFCoVwG 6A1t+es9nd3Q47AzrpvWDQypVg2BivV/i9vtTWPEb9DWMYzNbpL1AKHzV8smg1UVnDcY= X-Gm-Gg: ASbGncsg9vB5sSamyTr2TaPjS522SzOuqYaSxPBWAL4aR/id/SYWyiSsswApZAhb2z6 t/8fCiUD1OgufnwgVL8EaSZsw14n/TDNSHZ1ttlaRmnLEAYYyqAP9E9kCaac4bjpv469AXmNycM 5eu7a9AG+eq+Sm1P7WMKiQOnAUi0LIaQggRFZYPk4dxkw0ntZy1GKgh4OvIavn1N+Xb9cqjq7+5 DYz6jzct1ermf3wN7KS/gvdaht/Tcf9+kpTVAHj1h5ApZDjWkXSG4j/MOUNKOcGnXk8HP7XWeyA FKd3HQulRyIlQcW5Hl22I/IDddrg3fDVmcGaloqOQJjfeGCV+OSCnw== X-Received: by 2002:a05:620a:1792:b0:7e3:4416:1032 with SMTP id af79cd13be357-7e62a19b95dmr520874685a.59.1753309677304; Wed, 23 Jul 2025 15:27:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEztatUjuAJg5viKWoocKG4lic29O+zmUfZlMzk9L/lrtIJeODRaPJGCnGZme9YcIro3nirAA== X-Received: by 2002:a05:620a:1792:b0:7e3:4416:1032 with SMTP id af79cd13be357-7e62a19b95dmr520872685a.59.1753309676900; Wed, 23 Jul 2025 15:27:56 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:27:56 -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 05/23] arm64: dts: qcom: sm8450: use dedicated audioreach dtsi Date: Wed, 23 Jul 2025 23:27:19 +0100 Message-ID: <20250723222737.35561-6-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: xotsYgZlRl5MF47VUXjapyV9H2DxUVyq X-Proofpoint-ORIG-GUID: xotsYgZlRl5MF47VUXjapyV9H2DxUVyq X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfXxQG1B1gV46Ug ALEwd58xGsWE19O0uqIRLMJ8SbrwmP7KoyuH+8CBekEVjvhBdnOjwVeQVzokmgPqaKkdMZ5itdP RXRxo2PTNRSYuh8csb0Yr+isMT9+75kXqFOUiUZMV4ohBBstCoH88gwQShq6WDQChoWFpUdalv9 MmiamV70BZAsPCm3ErORFFr+TYMo0kydYCnqTC0zWQ8NCnVY5QnKWuOgeExv1t24SHEisIEEyly p022Z0zvXaUx6Z1B5nnGtI0zv0z60PtPVy0lAxA/5zEzg/t2fpnVe+fo94mwGOzH7Tig88X8eiR lAkDf3Yc+HbNJcB42XJgPa7N6SIFTkFwfsnERq+L17/EDHi0rHKe0sQO1fWq4F+BTsM/UsQjGO9 WoFIlIvKv0vucmR6WPwhZgShbWXRNYX0GAa0SOqgNRnMLQE4rQV1KpNRqpTxebSzLqNazX8j X-Authority-Analysis: v=2.4 cv=DoFW+H/+ c=1 sm=1 tr=0 ts=688161ee cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=aONcyR_MLncd44ar4gMA:9 a=IoWCM6iH3mJn3m4BftBB:22 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 suspectscore=0 phishscore=0 clxscore=1015 mlxscore=0 mlxlogscore=713 bulkscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 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 Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/d= ts/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 =3D <&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 #include #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 @@ =20 #include #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 #include #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/qco= m/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 #include #include -#include #include #include #include @@ -2783,43 +2782,7 @@ IPCC_MPROC_SIGNAL_GLINK_QMP label =3D "lpass"; qcom,remote-pid =3D <2>; =20 - gpr { - compatible =3D "qcom,gpr"; - qcom,glink-channels =3D "adsp_apps"; - qcom,domain =3D ; - qcom,intents =3D <512 20>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - q6apm: service@1 { - compatible =3D "qcom,q6apm"; - reg =3D ; - #sound-dai-cells =3D <0>; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6apmdai: dais { - compatible =3D "qcom,q6apm-dais"; - iommus =3D <&apps_smmu 0x1801 0x0>; - }; - - q6apmbedai: bedais { - compatible =3D "qcom,q6apm-lpass-dais"; - #sound-dai-cells =3D <1>; - }; - }; - - q6prm: service@2 { - compatible =3D "qcom,q6prm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6prmcc: clock-controller { - compatible =3D "qcom,q6prm-lpass-clocks"; - #clock-cells =3D <2>; - }; - }; + gpr: gpr { }; =20 fastrpc { --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 D634D2741DC for ; Wed, 23 Jul 2025 22:28:00 +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=1753309682; cv=none; b=HctEa3qOODs1vywWufe3hi1z44RjIzv/BchwhMDNGqEstPAjLrtNuSCkH5cd/XTRYbwE0GBYWmNebqA11wznsxkIGpyOWuNXLsDHd0LbrQFlqScQDCtk7dh2BLOcXigksf4oW7o/rNgfwuk6gAXjww3s/SfIKRzKtovqc6LpxN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309682; c=relaxed/simple; bh=DSNhzTi7DTHZSvCHu4rHl48K3anpGJND+T6PsNo7mgQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UB4iiDMXWuilgVAB4pJgLhjGTIZ984BSgHS/qm0lfm93Zb9pZg+IGziYu277t9rj7J0EBWuf2b5j2bHgcZ+KiDb7c9rq0ForwwRysQfunML/sgGDpDRNAZlTwzb2z1notpuHZ1MHBd9p9xCP7RkObtMHpC8EsW5s/vhcqdJEgWk= 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=QPMt0xAA; 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="QPMt0xAA" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NH69PJ023489 for ; Wed, 23 Jul 2025 22:28:00 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=ijdsQb+qWQR gBj7piRCjrWJt5D+1ItgSZV9B4FY1NUQ=; b=QPMt0xAAKJMO1lS3QfuYZWmsFK9 dwkJny0BZWLjlakcFzNYACLFhKzvLzree2V+vh4F1GimCxGHuqF+0z+rL2uP300R 7IxRfeh/uJm0m2g0EidfR6RQDNnObAPJ+ublV/hPG8nzDewFlWa7mEk1Ah3BSFq+ tq5lm3DCw3tvVPCD8M1t9S9FeUHBh0hINw0QtFrW2XKFkgpu2BVw/zWho3wvrbSp DCfVgpdXPnIyUSGXpKkQeJRu9cV/a9XZtJCyHrrWMf5eveD6Lc3QE5Jn9aj0Rprc 4p+ou+JOVCppnO1xydGeDa0u+xDxnqkxpzydH1Qm2At8zM4y0Fb6FN8tehw== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 482b1ud91e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:27:59 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-706edda34f6so5658356d6.2 for ; Wed, 23 Jul 2025 15:27:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309678; x=1753914478; 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=ijdsQb+qWQRgBj7piRCjrWJt5D+1ItgSZV9B4FY1NUQ=; b=rdjyfLSqjtIWQAHPJrmz+7TDlfocFgpVrjTJAOCslyeUBtKSySwvNaBYHpKq614yOM CIbTLgGDd0kwYc2+gp7cGclqylX3y9VMmO/QOsu0iVHWsSM7MlscVYPSYlKNWKBjK2Z4 uPW+6w8Uw/4+jU0atxkrMYt6DXgSQCu4GOC3XcuMeyraxiQuJLkaq9LO+aClSQOODkSV vlgWZCvxnlbz28iVQD6u5O+WD7UjPIzL6LWrQf6TgAhh63eHpe5bcW733Zi0pgSPmPBX xhtB+sruS/SNNsL11GMnd5uee3axMLaQd9EjEtdxkCBIIyx0osHVpXdnFsHbmDedwOXj kx/A== X-Forwarded-Encrypted: i=1; AJvYcCWd06f2Z880gC85QgED2H15y7mXkzCvnvgE4JilUIdGVDbV4bBuFqH6Zo5dZsKRf4J0PYzNs75n/KLGDTk=@vger.kernel.org X-Gm-Message-State: AOJu0YxBYHh+adUpv31f5gNQeuWUnkpNb+AOLwwOs9B2jhoRRwEp6rZh a+9Ap3fhqudmvd2gtoixJZr5oVozhmon6gldkRH0x9ZY7d8kAiqwM/99S6dcF8CRn7I42zMnwR4 MUzEXK84GAGqICg7axnFSCWTkuBCN284l2FuNIEDSzG8zmM4M+ITrEkaFh0eORTr3SNA= X-Gm-Gg: ASbGncv4FDSm1ge+/ndIyfr7ptNLErwP9asscuytUAX3C0RoX/Ha8ndttBwgAztUDVy KuJVnLZHcuTV1IYbQpeaMV5Xjx4Zvw2qk5s34NEySRXZjr3TvGkTHU5yodQo90vip+PTJxxvbIN wWuHpIOyXlnsy9PD5xamc9M6F7bsc0BdVAZZGX3QEsupuFWd/gBL0+iRq+HkMbIzKP/sSri8kIF 6VdBt8lfnbatoN3Jy4k40QPoT6ADdAoHVFlqEl9f4GyKzuwpzuvD8s1GhPwqXyfDl+0Lp0C47xJ mgX3LHztL1hFsnPlceEWc+DDEkVrZ6edbUcW2XTFKGbV9kMpU8rrLA== X-Received: by 2002:a05:6214:767:b0:6fd:cfe:ebab with SMTP id 6a1803df08f44-7070058cc6dmr70151416d6.7.1753309678379; Wed, 23 Jul 2025 15:27:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNob90yLrs2IMzxzG+kHiykrssTZW2bRzfVsXcr8N5We559q29qr8BZTKTVG30hf82+ZzDiQ== X-Received: by 2002:a05:6214:767:b0:6fd:cfe:ebab with SMTP id 6a1803df08f44-7070058cc6dmr70151106d6.7.1753309677899; Wed, 23 Jul 2025 15:27:57 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:27:57 -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 06/23] arm64: dts: qcom: sar2130p: use dedicated audioreach dtsi Date: Wed, 23 Jul 2025 23:27:20 +0100 Message-ID: <20250723222737.35561-7-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-Authority-Analysis: v=2.4 cv=LdY86ifi c=1 sm=1 tr=0 ts=688161ef cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=kZFr1r1NR6a6C5-aafMA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfXyTBPOEg82QGw tu4NILWPheCzQ77YC+poYMEifEWPcF2sr0wESZsY+K1oeXcVUx+opmheC6wWrqFVROBezkpC0ij hN6vsRIQ1lynOKcqWDxpw73HmycZO4Vlb1fK70EOGN5BjKGzcaA7B74WBHTLWJEVG8s8jTS74+k 86CLm6CbHFOCl/Bse1pGBhFDaYh19HEJGz+HFMk8MtOi1kxP99SR4sdTUqmGZ6vCm5UNFRfUhOE lHQgjLVI0cKuc75E8h1g2OaF4rcwZF6dBj6MUaUHCUbUtyUs5KRkxz4sYqLUBgLW97o6rxIJ/0G mYabkQ3rTnVYhMwZIdnOaG1u//uD3F+BZEcJNimlnXv7RMkJsQWsHEg4AtDnMvdORySEJJGklVh uykyJXNvy8d5GlNPHYyefi5gsQxd/lBqsyAJJEDhDyriDhcdfTOgMhbfjxdqlmWKkKuiHe3r X-Proofpoint-ORIG-GUID: oX8M8-c8QEzjGTQJfXbA6KViPJ13x1Bn X-Proofpoint-GUID: oX8M8-c8QEzjGTQJfXbA6KViPJ13x1Bn 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 mlxscore=0 priorityscore=1501 adultscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=625 bulkscore=0 spamscore=0 suspectscore=0 clxscore=1015 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 Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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 =3D <&apps_smmu 0x1801 0x0>; +}; diff --git a/arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts b/arch/arm64/bo= ot/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 #include #include "sar2130p.dtsi" +#include "sar2130p-audio.dtsi" #include "pm8150.dtsi" =20 / { diff --git a/arch/arm64/boot/dts/qcom/sar2130p.dtsi b/arch/arm64/boot/dts/q= com/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 #include #include -#include #include #include =20 @@ -1622,43 +1620,7 @@ IPCC_MPROC_SIGNAL_GLINK_QMP label =3D "lpass"; qcom,remote-pid =3D <2>; =20 - gpr { - compatible =3D "qcom,gpr"; - qcom,glink-channels =3D "adsp_apps"; - qcom,domain =3D ; - qcom,intents =3D <512 20>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - q6apm: service@1 { - compatible =3D "qcom,q6apm"; - reg =3D ; - #sound-dai-cells =3D <0>; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6apmdai: dais { - compatible =3D "qcom,q6apm-dais"; - iommus =3D <&apps_smmu 0x1801 0x0>; - }; - - q6apmbedai: bedais { - compatible =3D "qcom,q6apm-lpass-dais"; - #sound-dai-cells =3D <1>; - }; - }; - - q6prm: service@2 { - compatible =3D "qcom,q6prm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6prmcc: clock-controller { - compatible =3D "qcom,q6prm-lpass-clocks"; - #clock-cells =3D <2>; - }; - }; + gpr: gpr { }; =20 fastrpc { --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 From nobody Mon Oct 6 06:31:19 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 984542749EA for ; Wed, 23 Jul 2025 22:28:03 +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=1753309685; cv=none; b=o9Mdrk8f6tFxDmpXvnSQzlT11CcCSjZSQxZZyWjDhK6sAOfOEOM4On7cBee5wUnSrryquqb7hkGvr1OZJsqHihJy1EV68l4LzkZiYy2WMSlF7rOPcHdQHnOYV+XcMW+XzX5QOPB9Bzp/ZPCejW+ofvZd9OeMVwL+EuPpfoRZqlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309685; c=relaxed/simple; bh=Cg83Awss9xDJ8pD6V8b280JJheNN/NsF7gBEpQIitPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cU2E0l+xnX/0VKUQiUgpqzSfoTdNeZ61w8zyaT3NmSv6QOR/fRh2vCuqZEWgF1JqM/nssLr+381qxtzc0rA2sClWY9SlUcueEsrEX/L3e79w5u4G3Lo7vj5NPgMQJCltLvimO7uhr5Orv/q/ytcCP4r/AF0BXKTpiMC0BIPYFqs= 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=HsF8EWMg; 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="HsF8EWMg" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NH2IK4010846 for ; Wed, 23 Jul 2025 22:28:03 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=UVdcT72FVIp eN7V8jAd3K81D8qxPn0qt4t1IzEdxF/o=; b=HsF8EWMgb6+ou7u78qKCbPsQwfr 2iMmEFET0YeLF/PwYQi/GF7BRTjQXQs0q7wjClwEh6+DVgJERa4cEbYzUf0S2U1K HyY1IyevmD3P95KQBbR8gjLQgOmKqa1Dwm2dfcluxxSnMcDIyG5EqHKMfcrb8vkq PDetoaJig8URNTSNlq6cEOuDlzbSQmrlSXOxZsUD3CgHWk/l+NSErYejYErLwcYR w0x/+c+H0REOBwAFhTxONxoVyhX4vFq2VcWarNHtu4wc1MM1Tmvs99p3araLl37h ggN7v8HkqFRpCHUCvtUDgaoqnUryh56VpWldNO5N2lAt1b2BSx7QeoJwbQg== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4804na553v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:02 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-7048088a6fdso6124896d6.1 for ; Wed, 23 Jul 2025 15:28:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309681; x=1753914481; 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=UVdcT72FVIpeN7V8jAd3K81D8qxPn0qt4t1IzEdxF/o=; b=Y/chC0zp9cSr+QozQ1VhsoXQCkvofVCDWxqVhlrGaR3b6RFVYH0bX3wi8U2+j7/tde yIUm+E9B6TvslrPhaZP4ybX8RFwE0KVmY/lH9iPVSulMBglZuAGEqFM7Rd10N7+qw2jl O6o2wYHIttB2YK3KqDc/BRxiY2dUVyhXk0jYAa5CsR0UXCKWlc+PgtQqOnyrKmiMxUv+ vhwp1CteF4k3FOb1XZNIeRyF0otuj0hmq6H2GYW0CGGhkZgqJOFF8ILh1kfwFWgs3sos dL9YOQ8P5yXsVhIU6Vj9SYw44okiVVPhDgpEnH1m6AiDBDi95Oz6zP3EJVi+cqwesR8y jHYw== X-Forwarded-Encrypted: i=1; AJvYcCVtL47c7XcXnoMnSNcJc1mC456385tej4GPhNh+ItHnFxaREltEUGNI5TqNfSF8nnpaNCutRIrKUpESC3w=@vger.kernel.org X-Gm-Message-State: AOJu0YxddAP81jrptE0OzLZrgcOf07n7teYVkAUhR4hq9ntzFhWZYOG/ ogOJMsrT5zTSzziUEKbaurfZPR3TG2cQ4SxZvCbO/hEyl/t3OwTOVGhN5X9+2/wYVQUW9Fc1fAK gollIH9aJfHIj3+ltLWGnlTvmtKMT5gG6ZUwHV1GeAHrom53RjhdAYqPR9AyNVjlUvxk= X-Gm-Gg: ASbGncu0YtJBTWukveDIdD8nDvVDaCAFp0p/GpVg1KWEFo9KQiQ5kuLcPbFSeOfAiVf CllLs3BIoP0oO3YVvaF2D7zSYawgGdEE74C9VLFX7ARe3kxsOChdfA3vRTMoONF3RqRlCiVk8ms sZ6z8IYwQl2zYLseK9Y8RUE8iE/yU1aEjv5aTeYJTsA5kh5uIEw/meBeD+L8jCiQmjJw16+VjWR ontV5gxF4ldo8aeSR5Kr688idZtbYWh7rHbW+hA2NcFbWQp5IhkLefYV2HTW1KA12VoSM33TP1d IYS+irFWR23Cb1Ifk+QnMqZvUojK/BYlMsclx5aC/XoMAZUpMPRknw== X-Received: by 2002:a05:6214:e66:b0:702:da1d:7b6 with SMTP id 6a1803df08f44-7070065dddcmr75000906d6.39.1753309681179; Wed, 23 Jul 2025 15:28:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFR3Y70iRxurvn67ZH8uU8lWluwQrFXrLFgiTwqmBUbTtJeR6aH4EXz7NfsamMhwO5FbuMS8A== X-Received: by 2002:a05:6214:e66:b0:702:da1d:7b6 with SMTP id 6a1803df08f44-7070065dddcmr75000536d6.39.1753309680763; Wed, 23 Jul 2025 15:28:00 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:00 -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 08/23] arm64: dts: qcom: sm8250: use dedicated elite dtsi Date: Wed, 23 Jul 2025 23:27:22 +0100 Message-ID: <20250723222737.35561-9-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: XDAOiRwkzUxqKIW6fmkrIApUtnHWJl7g X-Proofpoint-ORIG-GUID: XDAOiRwkzUxqKIW6fmkrIApUtnHWJl7g X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX7NtWz8Yi0Jig 88Z2OCsPHGvropNkT2g91VFjeCdKOkEf42xykGUu5RlQWh1+11nMYgU4t3xfUaMnAV2EUb6m2r8 68Fm8P0DgQNj8Z8ZZ8VgttY2Ts4H2AwMbi8hvTA9R4JEpy2NCxgxJDCn/xpMgd96ecojsnQ1Xj+ PSQbLUjmUO+TmCics8dNikYCj7+stVLUxKSsrM3nOj3Tbe+m2tt01+8zclo14J7XFVynZ7N9qUi 8MaqxDDaAJlTpKSFjappjk27KdnalHBnEEJwV/rf8x60v/du1O18nYzSFJONi9Vtzl96LFysisG YfgelCrPVCMxCVJgZA5COpnMaghyY5n4+kwn0RLBx8pjQz/15r6UM71nwpd9rAAptYZYpdvU8aN DpNmewKjKEDxs/pLE8BlyiHJaS3/FaOF20fCu8pL6Ur+LXpgxFEn/v8LW5+zdExUmOW4Wn5y X-Authority-Analysis: v=2.4 cv=DoFW+H/+ c=1 sm=1 tr=0 ts=688161f2 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=He3Dqnl9yZ_pUDwKbX0A:9 a=1HOtulTD9v-eNWfpl4qZ:22 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 suspectscore=0 phishscore=0 clxscore=1015 mlxscore=0 mlxlogscore=725 bulkscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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 #include #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/d= ts/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 =3D <&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 @@ =20 #include #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 #include #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/ar= m64/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 @@ =20 #include #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/arc= h/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 #include #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/b= oot/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 #include #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/qco= m/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 #include #include -#include #include #include #include @@ -5999,58 +5998,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>; - }; - }; - - 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 From nobody Mon Oct 6 06:31:19 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 86946274B4F for ; Wed, 23 Jul 2025 22:28:04 +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=1753309686; cv=none; b=tj/XU8adjljjw7L4DF/3x+Gm1xWPu45UJnAmYs63LQqeQHN02LdJz+D/xR+YbZOcy/lQZv5bKH3b+DpKfP/Ss/ZOaUlkUJWfYn0tkHjOjVTsmiasrp3UzwRDiL/Lp8QkD7+CYABKebIfFQ95EKsezZ4xHR1WHQDqQ3kyM6PAWAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309686; c=relaxed/simple; bh=u5YnQTCt8dVSb/Fugq9BHu8/dHungUrT8rTY9TBDuw4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dl89L9xJ88r6pckXCoi4EeH9PLk6fMQ5+kdXIA4KFle1Yq6EdjBhN0baoJ9/CiDfdP633iUb9eUhDCfh5o27zXg0uO3C4xqlzH6/CoRdfwlVXOdGWfDnAQPNlBww0mqRB1Z73nh2ffwkW4gTKxZvISOdiOQn3HLnIGVjPBARmew= 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=PiObdMZw; 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="PiObdMZw" 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 56NH8Cmg008986 for ; Wed, 23 Jul 2025 22:28:04 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=5ftBTXL9LYh 4w82ALN9D5Q1Okarhm8+FZmAriFPFydI=; b=PiObdMZw8FadvApD7FHOOI1j2G2 zhqs4ifQv3MGDoymwI1OHMCw/zU9KHjnq/yGY3uRVEuMNa2MjASmMqQYjC+fjZFo shYIqZG6J8p+VfHNDC+97vd7tqQz9/mhSqMcgH5PE/Mvg9JZiP89pu3JidhCe09E ejXiN0XZ1x4KD7z091hBvEXg5MbAK3XP+0NdOUqHd1DMW7FRAxlqa4l5DsWMDM62 0Pe0Ym4xtnxDPNZVg183pedT0//7k4ZyXWtfaoczTj/mnfxMuCTTYdghgZp7Uxei KAGkpW+fNSMeTcDDNBrT5QUcJrMVzSridCceDsVwuoCK7h2fK7Sm2iPZemQ== 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 48048vd21x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:03 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-7070970cb2aso6387076d6.1 for ; Wed, 23 Jul 2025 15:28:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309682; x=1753914482; 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=5ftBTXL9LYh4w82ALN9D5Q1Okarhm8+FZmAriFPFydI=; b=PQlBahdLNfAS3uKZpMXH185sPQogQnxmqfyPeltSiEZZ6DuLyfbpzCZQHmrPcw+vZ6 MUVJ2aAg8fniSEXbgpI31AaACR2shxcw6C2MlatMJ1QoX9qm7TyvjE/UXyuoT5U/zTqI 3NkH7jCZ0EsqV4hY1zCT78ikNzCu/sWkaTOgR7yo1e+obdkjKIN2UnouYPbvNZcZhpbD ikC1mdxTT7dI/GdQHW+uUWHBjAmF9lK6qGJMjN88YwbdmeTldzqux4CP1MPeIpRcgRWr THkks4bAbTFohgVKE5bdOTeN94vI9h6mEOxr6Vc4tud2/ctGzKUsZM4dvAUqMkDS8xie +NpA== X-Forwarded-Encrypted: i=1; AJvYcCX27IX1IPHfCuD5PUI34/bF5JC5949V6D6THtWoWdco9cgHgCZPmkInJhPGOovBRMjE9IjK848QQWYlBx4=@vger.kernel.org X-Gm-Message-State: AOJu0YyYRGyrt3zKZK/MvO+Y04TSkGUd7lDmYrV8ab+VeBiJFNfAbWbo /BVNZkKImMX30ER7Svx8XuNsbE2xOPAd1JSqcCkq8JhY3eXrfi/M8O0cv5GDuO3jJu0FBX2ilYZ pbqfR42ex64d4cid1r/Q13WDSc79HRhoo3ZVZcPMPPISZsassYd4Q9b8TjGDHc8Q6wyA= X-Gm-Gg: ASbGncswoGmiqV9wyd8meSlBokBS3TZNziyMTZRYWZkq5JpJ0Czha+GekZKxZH6GaJN B2y7QDO7d8ocBjT0zdWPzSzJBJN17BRP9jQMq1LX2GYrxLsldwg2Wf42qknjONm5cDQEmSrhYkb SdLhym/z0rkcnhNn3Uvq7lnhD62baO6bswBiZKQ1NzbsUHUGP4pArXqXPG8h4zVwMyviL8VEvZa Z2GxKnKrMu3ufeGkffkNulCGI8df2zdr9hlkLTNTHFMChYejULcfXyhZs8N3KGw+aorG/f0W3NS Uhc92CPAdwlx2SAAyH6A7RvlHtOvpfNPOoEP/ZW12CwjbF06rBWv9w== X-Received: by 2002:a05:6214:4115:b0:704:b906:eaa4 with SMTP id 6a1803df08f44-70700736c73mr71555126d6.37.1753309682218; Wed, 23 Jul 2025 15:28:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNLAHZ8fpDxJ7lJK4dFDOw2FUpqvS5WNssMuZLaUDjr+J/WR6798RpyyA4BQnkgiXAuhAs8w== X-Received: by 2002:a05:6214:4115:b0:704:b906:eaa4 with SMTP id 6a1803df08f44-70700736c73mr71554856d6.37.1753309681719; Wed, 23 Jul 2025 15:28:01 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:01 -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 09/23] arm64: dts: qcom: sm6115: use dedicated elite dtsi Date: Wed, 23 Jul 2025 23:27:23 +0100 Message-ID: <20250723222737.35561-10-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: pQEOYimuMjzWb0q4a4f71MCO5lH7S9XJ X-Authority-Analysis: v=2.4 cv=SYL3duRu c=1 sm=1 tr=0 ts=688161f3 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=h0svG2ZG1csubjrOInMA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX05jOm1p9Klq3 zjEW19fR0/ifmnCpLwk4+K/7uHM7gkbHLDX1kRu/4ECGLKHNip9aFKZ4H4vsiJC6fgEARsTXRbv yliQeGS6JFt8auTfZitpkifZU1VWr8vxzF/4YOZIg6bUvf57EduTPljI8seB1iVFYt9v0N8zozk axOywfCey5wR12ezjpuEKBROuoRdAUxyN6hyQz8o1AcLJU2NtKlr5IGM45M8fEQPIAAbT+g4Y4m Go2FHyJfK620d7DJpd3A4nMS9CFLfmII5XceJNPuYRnwTJWJ0TRx9C6te0sLbTFEdMaEZixXBVj ijbSHMcqOLOHE+4HTIzCHczRhbg3lnG87wdqsfLAkn2459LpNnxLYcpQZVGGBJ67rG0qxLfQ393 TDHoSty956KwwjFZF4R0bxr+W0qErrdoAG46/PicqSAHAqor/2AZ37hyZq0re4HNgPZOL8Yj X-Proofpoint-ORIG-GUID: pQEOYimuMjzWb0q4a4f71MCO5lH7S9XJ 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=746 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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/qco= m/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 @@ */ =20 #include "sm6115.dtsi" +#include "sm6115-audio.dtsi" =20 &cpu0 { compatible =3D "qcom,kryo240"; diff --git a/arch/arm64/boot/dts/qcom/sm6115-audio.dtsi b/arch/arm64/boot/d= ts/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 =3D <&apps_smmu 0x1c1 0x0>; +}; diff --git a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts b/arch/arm64/b= oot/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/; =20 #include "sm6115.dtsi" +#include "sm6115-audio.dtsi" #include "pm6125.dtsi" #include "pmi632.dtsi" #include diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qco= m/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 #include #include -#include #include #include #include @@ -2729,74 +2728,8 @@ glink-edge { qcom,remote-pid =3D <2>; mboxes =3D <&apcs_glb 8>; =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 0x1c1 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 { 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/; =20 #include "sm6115.dtsi" +#include "sm6115-audio.dtsi" #include "pm6125.dtsi" =20 / { --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 6B8D3274FD5 for ; Wed, 23 Jul 2025 22:28:05 +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=1753309687; cv=none; b=s9LE1vkOyhg82CtEYikfcxdLGJcIvLHSn7oBA0C6Pt4Q1YsrpLU7Jz8Un8WKfgZfYSAPTJPE0g9X0o7vmbvy2ZcNi7oDCxLf5Af0O34E0Z+QTz87KUSjGPpbv5TnLRA+CXWfDcd6YPtWmmDmPdVYYeOITyGiggJKCLkUGvSGsqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309687; c=relaxed/simple; bh=5IfQLskS0Jn3UK0ZpUTxI4rJLSCAb3mbM5urHpKXMO8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZXK1qlL/8wa4voFJ12gXsAzlzhKZwi7PpW+hJnlXsYTsTy5BGTuMzYcXyBTMmAOzmS5VndQRQCiLMJxjndToCG+m3Kt6YSQuqKReoKqa9XNEMovKEDdLJHz6kJfzm4YbVgbBtkqsDjPXEUgz66SCWtW8GbWshw+qkm7AQDoSLqc= 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=jNtdTFwv; 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="jNtdTFwv" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NH67J1025883 for ; Wed, 23 Jul 2025 22:28:05 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=CAwCyznw1ti fR2eCEf/ZZcHhw4uQ6oQLdlE71ilLV/s=; b=jNtdTFwvSCuFuLsavNub4yYP4Eg vlfXZwzqkH7owc/Wbf1QxibhWvoB5vYM8/UNkw4qef1DtED7Bz67CQ9krmX2vRMS xE7KLy0qdIwkzZG/De/8xVHuylIeElptkIZzFeujpyiohVrrGj3eZI6xVl7HHhCp 5AwYuqbLvmWHmWHQkA8OYlVW+pq9Tnw8J51+TNuQU/UKpXypjkqx+XwZU/2m9l+a mEHwIHpn/xnJj7hR7r4rm/7t1TBMwXuw0j0oNXwLSGvHS2AOSygaB/dQtQOj8jeR y70ZHjdSg//o4+hmUdBppxU6QivAGO6b1qd24JC/O2OuGgavKzeRE2SQy2w== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 482b1ud924-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:04 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c7c30d8986so104969885a.2 for ; Wed, 23 Jul 2025 15:28:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309683; x=1753914483; 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=CAwCyznw1tifR2eCEf/ZZcHhw4uQ6oQLdlE71ilLV/s=; b=ZY5vmJ0iZT5U95wwuj8MYt/E6JvzDKFIZO3eV9V1JvbmX/6nNZNb7flSKRWDwEyTku xEt7bxTr5G/xD5l9f1J2V6ESAON5iwa0FeVC/DauP0EbCrdNkp1bFQeF8dYMQJfBye3X sTX7fPCxWmO+WLzm5UdKCceVc/nm0DG9PgR8ZO2Kn5PVQ9+dg0I7kqKduP8qAAr11VuA pNMgcO+u+7ApRzPkVA7B3fi8sca2YWRp9QVqgO1RUStw4gOhrvfuKz5sXvJyL8SToBo/ YXuJcNqC4q3jlO6fjwUWYzorHr+qw/VL4imcshfEYtcb6PpT+AASKO793PQBOEF2O6t9 hx0Q== X-Forwarded-Encrypted: i=1; AJvYcCX4UqiNhaW39LRxRbUTCTeiqNh85ALS1wbp2mmcy85PhkQtD28VvwBzweAXiN0VrqKk1oF8Lg3ASvvXtL0=@vger.kernel.org X-Gm-Message-State: AOJu0YyaPclI9q/N7+E5IcCxeJRSXDhnY2YTjqae0kax0PXBlp1uxPG2 gPLG7bJ/cW4bJ6ymet7lQ1iJaUcLChLaiM/TK1tsL64aXWo9OlEiXu1xj/xwNmZOG67D0ZttzlY MJXPQUPvBWLZ2DJQ1pIPQyoE+WUNoNQB/QNd1nBCkxkvLub+P6IjCMreCn6QJwCOApHY= X-Gm-Gg: ASbGncvPORtz9semtOF1E9xy6t+N8fXBmleZndGqTaVttwBMhbI93OrzRaca91+LIBy 1/XZQauW79ZeKRvJez3MclubmU3upq/zOARvEElbt6MOvoYQxm53nVzGirco9O0jFhND8C2krxL J3ORcEzcqdhFGCzqY/2SVuBwEalVuygreHxehcHBNX63j193xmj9st1P2VjvsLnVIHgRjPxPnmY xxsDy6mOmfv2nE0KFqC9MKhEFMZuEYVnPWoWnUtL13sPJoBDYbTqdoD0K4VuIBBG6DxsRat6NZa LZgYetS/9e4MqtHsTLDMyzBBQh4X51G8NzwTWIbWyk11VozOc7LTAQ== X-Received: by 2002:a05:620a:890:b0:7e2:fbf7:f2c8 with SMTP id af79cd13be357-7e62a1944cfmr440002285a.52.1753309683201; Wed, 23 Jul 2025 15:28:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF9cFbe0eoXQC1HtpgCNLwKH7Z8oI9GtOC99caV95IrxYZN7SWj5L1yj2jt7U2yiVdCHkFJOw== X-Received: by 2002:a05:620a:890:b0:7e2:fbf7:f2c8 with SMTP id af79cd13be357-7e62a1944cfmr439999785a.52.1753309682774; Wed, 23 Jul 2025 15:28:02 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:02 -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 10/23] arm64: dts: qcom: sdm845: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:24 +0100 Message-ID: <20250723222737.35561-11-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-Authority-Analysis: v=2.4 cv=LdY86ifi c=1 sm=1 tr=0 ts=688161f4 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=ZxF_z8GhOwlPRV4PUNAA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX8sjGZSI8M+eH Uzy9h5FsYiXAwYYO+uGDEpASeaTihAc+dC1CIDUNs3hFQVUnyo/uis9TlmsLDpaS/6TkRnszV7f AQaWw6J8/2C+qtGkC1mbd6yFaaN3JSJMCMqkDU5STsPZTySo6Hkuzm686XqVb9UTDZDt9K6YyS9 yxsdq2AWm74p/ST4djSqfyyrwMPihgJA77SVh/7DXSZa0199F6Xag45hEKT446vdpuGBIfygvKz mMzhnSY9uDLL7CkNtxKjd+phhmdPClefy8HcPoPrKiHwcVWr42DV450elQkMm7B5+HGAxSCJXD0 Bbq4CsGY6JVHlO7s7x6+ensQVWb1kuyjbNg19oUf428eDi6IDQvVJ+aaKI+1g4IbH+UntrOEEKh qRF8GNMDQNIO8C2HQPVrM4P6Csaguvpm8Llo0szSn2RVqX5sW1MGAGM5WAH0WHYxRTDYqQox X-Proofpoint-ORIG-GUID: bolj4J5g0wo8fR6vb15XGd-Fq8Asd6iH X-Proofpoint-GUID: bolj4J5g0wo8fR6vb15XGd-Fq8Asd6iH 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 mlxscore=0 priorityscore=1501 adultscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=985 bulkscore=0 spamscore=0 suspectscore=0 clxscore=1015 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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/d= ts/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 =3D <&apps_smmu 0x1821 0x0>; +}; diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/d= ts/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 #include #include "sdm845.dtsi" +#include "sdm845-audio.dtsi" =20 /* 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/d= ts/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 #include #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/bo= ot/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 =20 #include "sdm845.dtsi" +#include "sdm845-audio.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" =20 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 @@ =20 #include #include "sdm845.dtsi" +#include "sdm845-audio.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" =20 diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm= 64/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 =20 #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 =20 #include "sdm845.dtsi" +#include "sdm845-audio.dtsi" #include "pm8998.dtsi" #include "sdm845-wcd9340.dtsi" =20 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 #include #include "sdm845.dtsi" +#include "sdm845-audio.dtsi" #include "pm8998.dtsi" #include "pmi8998.dtsi" =20 diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/a= rm64/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 #include #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 #include #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/arm6= 4/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 #include #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/qco= m/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 #include #include -#include #include #include #include @@ -928,54 +927,8 @@ glink-edge { qcom,remote-pid =3D <2>; mboxes =3D <&apss_shared 8>; =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>; - qcom,intents =3D <512 20>; - - 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>; - }; - }; - - 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 0x1821 0x0>; - }; - }; - - 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 { diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qco= m/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 @@ */ =20 #include "sdm845.dtsi" +#include "sdm845-audio.dtsi" =20 &cpu4_opp_table { cpu4_opp33: opp-2841600000 { --=20 2.50.0 From nobody Mon Oct 6 06:31:19 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 4FAD0274FEE for ; Wed, 23 Jul 2025 22:28:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309688; cv=none; b=IBJHUvW2yNLTW39QqQKyRu+VYX9wAf924fm75r1KBCXwuEx4vAJ/cWSr6b2gCdFopHlJNxOhXfQnmduvLoqDq0XJ5hqciJoaZ9gAPHdtqlcnky32eS/Y9sQ3fVE9p5SCUZvfjMg1sN5tS1HfL+ZedXWfqZ/1pwb5wAvHKhacQbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309688; c=relaxed/simple; bh=GZovDhI3KIvNWEQqtfPo90i9y/ccJUL2n910bxESqZI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z2lU1bxQ4Nygiwai+Xzd7xxJIg5FLLHolDem4ydY0n+VTk+DpDlRFSa6mQJ3H5rEMRBjWahW97GpPIFbUrQUQa7t4iRQGBVvUhSYHOiI2enfIm3vnDEJZ0Fzr9fLFY3Rtc+f0+V5dVsSu1dcmzbRQU9o67YPRPbplhkOsAYDjR4= 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=U0cYg7H2; arc=none smtp.client-ip=205.220.180.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="U0cYg7H2" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHrdHE032272 for ; Wed, 23 Jul 2025 22:28:05 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=i963kRzz7mS JAvFLKAqickSsiw6bz65u5/y25yzIkek=; b=U0cYg7H2QMp0KpnBvQqKFSkSzs7 gyZ8au/f07vgXd15OsL1qzNZImKTHSwkjU3HM92O0nprjuBYmT68g/IOJlwKSXaN XlMy5T+KCe1nzcKixeoUgjViplDb8GYm2EP0XKlPJPbzpFJMIbOU3CUq2f8lA32b RU4Aw7WNJBtpbkLvudiden74ENUC+71vSCIvKU/8TV9FTMdKwMtiJd89R8J5fVrg cFUshQ6tSHOE/amCJC8KIaxhmy/7KMVCW8G+y+9jRAvmlKqBgASQHlOY/Wg3aK11 L1vSdZ1s049RbqHo563NGWw/InUvd5rEbajhV/ScC8k41+8Dgy0Vf7k9wxQ== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4826t1e139-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:05 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7e32df3ace0so32010485a.0 for ; Wed, 23 Jul 2025 15:28:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309684; x=1753914484; 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=i963kRzz7mSJAvFLKAqickSsiw6bz65u5/y25yzIkek=; b=fqM7vXWCnoW2FrhWLM391gPB6rscxzfz3UD3Go9xnyfbkztpQRxYrzBE46MqikG+BB IyM4IS1a0hdr+04j1VdskS44XdrwCxub/U5sP9p65jNqZ1YTFtxVHYqrlJgWA0RPX7m/ lISgOE1kk2P7rewoZB6Ozx4/g6rGWEqSmHCAV7OxioGF9XDO677+UvMqHIqT0kwcwZXB dwW4ai3KMTAJryTkVqu8qspvyElKHn5iNhmjycCUYSPZW1n/6ii4WuSlhDyVBtYUDEgP D7HGzwkQlEGfOHnaCWRiPzZGTV2Rw819CHBUSZCKLW1OO0CWxv/DY2p4B13EUTkl+TWO D3pA== X-Forwarded-Encrypted: i=1; AJvYcCW00LThe7kh7kU+6QYG3UUqShDOc4vzieeeQjfM/xkIYXaObCWV7K+iwha6K3R+DEjQ6a0VQC3FcRzgSww=@vger.kernel.org X-Gm-Message-State: AOJu0YwXsMfP08aqlQyUxdvnPfPNHY68nPYGvdZPoc4FM4eh+nETsHkM kFqWHFGOvXtulK/BJ5Yal31pprUKRvBooT9iQkDnVtj2tJxiSEJdYOm00eQ+g0lrCndisCIe6Nd naNGs7fn1DfDKYLLT0KkXh4r2xUvqKSnZz/vqIn9KDjBZT0iJFOWTI5lixamHBlHK1FA= X-Gm-Gg: ASbGnctrrQ9RO1gzxXMv3ZNBRrPOzvYgLCjnZY7Qego2nv6+f22d92AUonS4HmSTICr TIm6bmBd5gUsfnJVRaQIHBWfo3Tp7IZuFbcX+QIPUPBfXinYlq/YqGGoKoYNRt3be2yCl2Bwttr NI1ZZjrgzAOAHRtcVYqeIOrgYf6c0wa6TeNpVmuBNQv4sFLxvBlPFGUJ0yZo4Qw1xw9XrpXi/4J +MTVsjxeaHyk1/kpcXJ3Nm1kb+TjX4J6pE+20Cnn0HmBVqGHGwRxJcnnCi6qOYBvDAQL+mQb4ha RfADzaBYFLYVi1vShCbl1H3QbgivemflZs4EDXMfDPTbcFETJj9/hw== X-Received: by 2002:a05:620a:430c:b0:7e6:301e:d03e with SMTP id af79cd13be357-7e6301ed169mr207200885a.12.1753309684182; Wed, 23 Jul 2025 15:28:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFx/aZlDfmJskiYExoJos0IgrbNdsw8hv+iwP1Zu+9SoGCMnhK5VUPuQGwsMnxXkiJ9tKnVRQ== X-Received: by 2002:a05:620a:430c:b0:7e6:301e:d03e with SMTP id af79cd13be357-7e6301ed169mr207198485a.12.1753309683722; Wed, 23 Jul 2025 15:28:03 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:03 -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 11/23] arm64: dts: qcom: sdm630: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:25 +0100 Message-ID: <20250723222737.35561-12-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: w_u7iZV9sUY04oZBfMrHw_9x0DxbK4Wt X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MiBTYWx0ZWRfX5w7DphL+2n31 Lxjt/YEWGmA63jvHcg8q2jzfL45GeHRloR1tj37S9f5Ki5Z4FYe4gtp/7e5t67BrYRfeL4zpiTT yK84V0o/fem3zMJaFAKB/23Pr3AuvLrI0bWeAtThV5ZA6neGW5zuKs6wFgUM2UC8oUXTZFSVU1J PHYzTU8hkY7K8eSUAiY9isQoyPyV2z1HbIIu18q72Bsi5w7+v6A0QQ3FxG7qNEIJ0EYyA8/ifOA kqxskqOGpUNa+WVp6Q3Chk3VDjiT2wQruytZyQVbkz3+6PB0MvbJ+fJx1g91MpOhbjrm6rvbERE PNvzZQmBJd0vf80IuLyy3ZTHjo3FN4QMVrU3W9uubvJ7BDTQ6Jpe3NOPEkM28CIjUa1Hry/QSMS 4Pii6gm5t0R/u5wPbELx4tVgW2Fns8XQHzMA5GdfWY3va6hkCdHGggBhfBWzR+/scVA2qdpu X-Authority-Analysis: v=2.4 cv=E8/Npbdl c=1 sm=1 tr=0 ts=688161f5 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=NCDuKiUfWsd8YKX2kAAA:9 a=+jEqtf1s3R9VXZ0wqowq2kgwd+I=:19 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: w_u7iZV9sUY04oZBfMrHw_9x0DxbK4Wt 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 malwarescore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 suspectscore=0 clxscore=1015 phishscore=0 mlxlogscore=551 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507230192 Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/d= ts/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 =3D <&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/; =20 #include "sdm630.dtsi" +#include "sdm630-audio.dtsi" #include "sdm630-sony-xperia-nile.dtsi" =20 / { 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/; =20 #include "sdm630.dtsi" +#include "sdm630-audio.dtsi" #include "sdm630-sony-xperia-nile.dtsi" =20 / { 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/; =20 #include "sdm630.dtsi" +#include "sdm630-audio.dtsi" #include "sdm630-sony-xperia-nile.dtsi" =20 / { 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/; =20 #include "sdm630.dtsi" +#include "sdm630-audio.dtsi" #include "sdm630-sony-xperia-nile.dtsi" =20 / { diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qco= m/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 #include #include -#include =20 / { interrupt-parent =3D <&intc>; @@ -2293,50 +2292,10 @@ glink-edge { mboxes =3D <&apcs_glb 9>; 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"; - }; - - q6afe: service@4 { - compatible =3D "qcom,q6afe"; - reg =3D ; - q6afedai: dais { - compatible =3D "qcom,q6afe-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - }; - }; - - q6asm: service@7 { - compatible =3D "qcom,q6asm"; - reg =3D ; - q6asmdai: dais { - compatible =3D "qcom,q6asm-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - iommus =3D <&lpass_smmu 1>; - }; - }; - - q6adm: service@8 { - compatible =3D "qcom,q6adm"; - reg =3D ; - q6routing: routing { - compatible =3D "qcom,q6adm-routing"; - #sound-dai-cells =3D <0>; - }; - }; }; + }; }; =20 --=20 2.50.0 From nobody Mon Oct 6 06:31:19 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 749CC2750FD for ; Wed, 23 Jul 2025 22:28:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309689; cv=none; b=n9X3sf22FyL/pGWWeHkGsV8HCnswd8vJxEkkPfOE9aghi4U2F3cYqRXQfuBuKZ/EzBPvC2aQkipc4cyYTD36hJaiFtkbGrjaNOp5C3oRCqveQ9A/u1glcQilgMu1VvhNWlQQyLVAENlb4oObZGrVoMogOlKcGeUxW2r7+YD3XHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309689; c=relaxed/simple; bh=XKUT827Diya9gsdp4NNt9fGXSOQCjAATOLC9Fo6qTZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U0t0EnNO8VGX3BpPuXKesQDNcr8N+h7h7VgBwAQysEw1Ry0sp2KXfTHNkR8PbXrzTglJueR7f3peTueqCOqRBHtauOyVUv6MkeSrD+GCqKPPergNybyEUxDF7vCLq34yq8eQvcaBHoZv2B4Qm0zcIR0O8MPgM3X+BsmNyOUY4gw= 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=UAmR7TyI; arc=none smtp.client-ip=205.220.180.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="UAmR7TyI" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHvhtG021374 for ; Wed, 23 Jul 2025 22:28:06 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=CXn962hWIOP OoeJqFuEfdqIL0LSAbPGmMjDTrF+m+FI=; b=UAmR7TyI0vIwh+trJlgInwO5DhX 8ix+eY+usqjaC737KLEPgiSbBYBXdrBe6VnEYZlhv2V84jcYDuS5SOHQvme+frUK Cxa3lBbuAEHsCskSyEt9kCXInei4nHJ8yEdV0EMTf5mhXu1C0is7FjZrutBpdDGq Kgx1Ca5fchkkLjbCQuH4QtBg/3Z6+uxjLm0upBRErQYQ62GqKmxzOI6AC8ObZAqd xoTwEHiMogqo0oaj/V/OmC3vrDaJXfjv3urRhCV0oJHcVlgWaED+tOzNKFzFXy08 E+UbifJsQfcc6TtBUA8xo51pXn2Eplyks7QiijjgI/UdhMfOElg2MXUd4iw== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 481qh6ruyj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:06 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7e03ac1bf79so28340685a.3 for ; Wed, 23 Jul 2025 15:28:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309685; x=1753914485; 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=CXn962hWIOPOoeJqFuEfdqIL0LSAbPGmMjDTrF+m+FI=; b=pKJkmG0RSspZdU19ruwsNwhpJKDjgyAHr3rQ7GGsN6cmi/vBBV2CHTPVGpuM83gFfP dullFzUK1MhT2XEnD9cHRyF7dLG67X/+Omyj/XeGBmtGUdXcQ3O7yl1UVUkZzRksnuqB N98fliuwjI16YIwwt2nxtzv+Y51uUGe5E8boEgsQNk0alrj3vGA0QUrRfCz9R7kKtQo/ gqFlcIIGwUxR4l4+PHHyCeXAGSL5jJp9hmS8CnbeTHeZqEaxUxrJ/xJvXp4NlQ6IufEI EdkTP8r/0d2RS9LXxK90futMHITPkBtkVAIkHR3Dvf5cfezBnxQ135vSx6rHeKi8e2AG eGxw== X-Forwarded-Encrypted: i=1; AJvYcCUyViynTOObhqEwKMrvJ0B/vjOqJiFVlCpnFCq+881V83PbiL1eOhDrl1D8a9toezvf9pYbucgiFdzicVc=@vger.kernel.org X-Gm-Message-State: AOJu0YzjNqYTniYkoUHGfruDfWt16jv91UGkv2htdv3TGD6cn10fP/UV LJyz9cWQvBwMsQFaeaoMo4wfpoXX8+2FQyv9iUaz5CUiSsnI9/vaUZMa5h1I8nNy7lg9Q05vQlY EtHmaV4UKlK/b7wlHGeHT0TeCGTLpppiXcaTqkFU0cOwkbrrs280MQK1RXyvv9WSQYuk= X-Gm-Gg: ASbGncupza6FRjJ520evffw8yh65EsEOdVlM1ebzt7gyMSLJIawxtXgX8wpeXNOoqv/ nE1+ZF2Uzq895PfeeM0JKQq3vEhoPR6711sdSHCDSCnaSqXSeQTDPaFUofof8z31loIncv7apCf NfykOLq2IpfkJ8R9rRqO8NFsjzfDIPiU6FP6UBDKPS41tILnOwAnHkN51RaHaTXOTAxc9XJ+2Ac tRe/IZvLMyugY/x1GU3Tdewbb0XrKWN8JZ92yAsyNZ993e/aUfTV4dwUEiJTs0fKfGg547wn0aV rCI9nP1I00bylov5quD8lKDOa2mw55rHlISDrSEtzSYlliSvFVbNng== X-Received: by 2002:a05:620a:a801:b0:7c5:a463:397b with SMTP id af79cd13be357-7e62a0bae6fmr556282885a.20.1753309685267; Wed, 23 Jul 2025 15:28:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBaYYgjplFfHrigZf+gmGdcu9OSOBsDXBghP3CWb5gaq5AFlONgypaFZYC7TwPZRdruuNSEA== X-Received: by 2002:a05:620a:a801:b0:7c5:a463:397b with SMTP id af79cd13be357-7e62a0bae6fmr556280285a.20.1753309684769; Wed, 23 Jul 2025 15:28:04 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:04 -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 12/23] arm64: dts: qcom: sc7280: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:26 +0100 Message-ID: <20250723222737.35561-13-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-Authority-Analysis: v=2.4 cv=CZ4I5Krl c=1 sm=1 tr=0 ts=688161f6 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=ZVUBih3ntuRNDiIcMoMA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: aoMiHJFj3QsVonyoYaUaTJRt1vjL2wak X-Proofpoint-GUID: aoMiHJFj3QsVonyoYaUaTJRt1vjL2wak X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX9K7iw04ZqBgv AQXLn9Dcj6CKwddv2CTbj9O4yawAEdl+RH9LdlL4cHHtE+Pw5uh1hsshIHVqkOrHgWD6xZpOStt coDp+te+fjRHRxne2jrCX5ds3un0TPOwbuLOrGg9GE0Unxh3FzCO5cs3NP/WydC7lQq2l03kv54 9atJocli07TpLStyGaGnn23VqcM9cF0ijrPQjBhvWoo06iOPU9ZKePDMSZ8vA/o6toyfGmEbIxP GOTr+u+Fyk5GDfivpn264u2zgnA5T3X7Tbw2zMgH44YpnKWxUphwOxbsA2vflyHCG1biVsPiIpE 24xvtgOgUclfdVVpug1GZggiS/AL0L9N4JhFIslpAta6zajWg8teAOWKru1pv3V6dr/FG3Ora6p 66pSylkfXUm8chCdqVJnLo37Vqjp1BILtkcBSZabET3h/itqkz8d13tMKG0xilv0RGKWPOvY 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 priorityscore=1501 suspectscore=0 mlxlogscore=999 impostorscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 bulkscore=0 spamscore=0 malwarescore=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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- .../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/arm6= 4/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 #include #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 #include #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 #include #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 #include #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/d= ts/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 =3D <&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 #include #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/d= ts/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 =20 #include "sc7280.dtsi" +#include "sc7280-audio.dtsi" =20 /* 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/qco= m/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 #include #include -#include #include #include #include @@ -3833,73 +3832,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 { diff --git a/arch/arm64/boot/dts/qcom/sm7325.dtsi b/arch/arm64/boot/dts/qco= m/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 @@ */ =20 #include "sc7280.dtsi" +#include "sc7280-audio.dtsi" =20 /* SM7325 uses Kryo 670 */ &cpu0 { compatible =3D "qcom,kryo670"; }; --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 7B73A2586C9 for ; Wed, 23 Jul 2025 22:28:08 +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=1753309690; cv=none; b=u2lqFTOSinG8vMlIjf/IVaT+Zv7Jic5dHcm+ZLfNQopj0ukO/1QCBtzCqW2DV/CzqJdpUc8pCDUfx8dNDMzZMefYYXhyaM8pEU4tH1ZRV0/TgXUkVG3WYLrvXdCW18cUKiAS3X8xX3tK+BRfFLggJ1s6RxiRlsAB28lWG8f7fLo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309690; c=relaxed/simple; bh=pfs8ocV5oFyu+lsbLXH3Ei8VFhET21gpR3lNBPiEabI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kc4PGpxzmvq1M246jtqzwUGTjRUnEOVFvLiz3gNtGd8MRxMHGr8HS594H280YqFUQ7qqWUY3gKs8fdLx69afJJ44efhmwjhPPKSJWk+fyGHht73mIyVSYNzDm1St9da0kosWSc8nuE4o4zhstcnb/IuVk6C1uearhl98KQlGejY= 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=jwKYWZo7; 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="jwKYWZo7" 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 56NGn7Ma013815 for ; Wed, 23 Jul 2025 22:28:08 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=P0uXS7Zq6oD QocEsaGxMO8iSgriP2+3nxyR1injnx+0=; b=jwKYWZo73o3zTlAWN16XzqV82Lb u6j0x8g8vawdJ5kWP6E2flBkPauwZzp3PMxXahb081dX08RtPgH7pmE+jHs2B/7O F+ry373p0sw4rWAH8tDxzGjCMhebJ3MXUwlQXaEyLsjy2UlRefhJnqrgJWXxSgAA b7SEYfokD8Okmih3WoQTpUDqy3vvrZbwfEfElevzRSDgl30VovCOMVSc4jCmro2f /E3lygXFAU0gwdh5xiLJ8TVp4gXD6HIadsXNzz3gSqBa0gItvjaBxofY2GMcVS0c IoQ9lPXcjWePSx/C58p5WwyoIMmMmDy8REK71V80eiegAWLDJfSjpSf8bCw== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48048vd229-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:07 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6fb01bb5d9aso5742146d6.3 for ; Wed, 23 Jul 2025 15:28:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309686; x=1753914486; 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=P0uXS7Zq6oDQocEsaGxMO8iSgriP2+3nxyR1injnx+0=; b=QjzB+VblmMHO/hNyjNXpQesZlnJ9CvC2Ed9DpFHC9ss84x2Jbm3ALM+PZUt47D01Md ctH3nJ40pAeeyFhBbn8lrBjJNaRpiWT7IMXACjhWOYC2Lnip7tIc0GyZszNFG4gDGsVf uPRWCy2PnlT1k4Ztp/FDWDxbMMXTGyoizdYs108cdwOj/te6g7PIeLtBzHNypgXMPiF2 S/iOBxnU2h8/kPD7XdRrRo8NI0XGZJfOaymnfiJuVNMXvzllmwr0FCj96Y+6dZ5SSoXm gVA31X2RnUU+2Qh0C/nVmQdn/lY7VCVW/neITEzpnLfaCZcSsmv+g980F+LytY8JJASL PeYg== X-Forwarded-Encrypted: i=1; AJvYcCUUInoK243mlLrvOXxplrEOQJNG9aHnUPadC7P/ze+pMK2f5ICupdVPolbJ8tzffMkYfcM1ciKIzZpPnEw=@vger.kernel.org X-Gm-Message-State: AOJu0YzUjOHZlz/0h6iVQsvinqHBImRRAoWs1P1XeUwzmXB4rOdoQSjZ G+bXmLipIyL7LGwesH37rexrJp9sOtI6vBi6mIfmWEWTblCMVI3uxM73xvDKqJk03DrJorcSFXm Cbbmsd+pH85zFHHD/2BA06pbDkjF+geAkmKKWUYoRPBdrAKSf10859djWQT6NN28JBjU= X-Gm-Gg: ASbGncvdmflXPRiT9z18aF8vm35CZ7eZuSVEwxHn4EamzN852G5Wdcl7SfkPakAgIBT nYcXOTiYEaOYqjSl3Pm9VkoVh90tiFNiWxukWCXn+mMGl7t2xq/8NERHkKIrWZucreZe//2Uc6d xg5Qs/K0TpyTpILyKQ29OFxkhrDay/hLYjymA8T9rPosyecEdPXsF+z8LQLnydmaYDwdzznk9w1 K7LW/EtfqwM/YO6pctHbbPEzlhXLqZsGJyqyik/BvN7b7vHOKWh9pQNV2u9bBEnWKDgnFUhy4Lz HAGlItL8g1q2cYloHU/LKDReEjY8aQpfZw8e1l6XXKNLwoKOL6D6ow== X-Received: by 2002:ad4:5aad:0:b0:705:2db:b28f with SMTP id 6a1803df08f44-70700711d14mr64262186d6.47.1753309686372; Wed, 23 Jul 2025 15:28:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRYaGb7My2NTW7nvntpnILXMpKTLb1wZbqZngoqPvadM9aitX/bxEhJQckEoagg5bos3CBKg== X-Received: by 2002:ad4:5aad:0:b0:705:2db:b28f with SMTP id 6a1803df08f44-70700711d14mr64261906d6.47.1753309685778; Wed, 23 Jul 2025 15:28:05 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:05 -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 13/23] arm64: dts: qcom: sc7180: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:27 +0100 Message-ID: <20250723222737.35561-14-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: i-t6Kb-u18pUoxVH2vUSL8vGofZN56Dx X-Authority-Analysis: v=2.4 cv=SYL3duRu c=1 sm=1 tr=0 ts=688161f7 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=jH0tB8uThlOIpdONzZoA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX4BNJE5inG9rM tI1xothJzmVt2Ks+lsrBzVPPMCHWb12G0ixKifYHRiRpluKAaCTSTrc37flRuFtWfUdKRsTn4KW MkyzgvgIsa4yF10OsiZ0YuNoYnQVWaCeZJ9HFDxfLP0BsXqQA16JrSINNofxokX8yseiKpjZ32Q hIK4BQfDoTVMoOJPW42riuAs2RL5y2/AFCWfZ3TkxgDhI9m73F9THpm9pd5iYgIlm0Nm3cEaJrN wmkplvDAYeWtzdEZJYdVlux0r3GlDHqdiMOBv0SXppqvVIvihMLWL5M4tw5epCNR6rZun3RKrFk pdvArPeDNYb40d+1HDeMhxQlngNK2VwPS19yrLzEsl/QGUcsqhdpAKTqAse5LoiHx5f48FBexBo lfn6AoWQFnALOTGSN+H4lvl03vDAfBBXYwvZbWPmN4v8N02Dyf8TlOI2gwkI/ObmhtUobJqi X-Proofpoint-ORIG-GUID: i-t6Kb-u18pUoxVH2vUSL8vGofZN56Dx 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=870 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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- .../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 =20 #include "sc7180.dtsi" +#include "sc7180-audio.dtsi" =20 #include "pm6150.dtsi" #include "pm6150l.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sc7180-audio.dtsi b/arch/arm64/boot/d= ts/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 =3D <&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 #include #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 =20 #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/qco= m/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 #include #include -#include #include #include =20 @@ -3876,61 +3875,8 @@ glink-edge { qcom,remote-pid =3D <2>; mboxes =3D <&apss_shared 8>; =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 { - compatible =3D "qcom,q6core"; - reg =3D ; - 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 0x1001 0x0>; - }; - }; - - 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 { diff --git a/arch/arm64/boot/dts/qcom/sm7125.dtsi b/arch/arm64/boot/dts/qco= m/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 @@ */ =20 #include "sc7180.dtsi" +#include "sc7180-audio.dtsi" =20 /* SM7125 uses Kryo 465 instead of Kryo 468 */ &cpu0 { compatible =3D "qcom,kryo465"; }; --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 4B446275AFA for ; Wed, 23 Jul 2025 22:28:09 +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=1753309691; cv=none; b=aikU8PxB7JOi3rCilZMCQKty0cRfZmcdQDs+KbU4RP3IvnLFyeL8gFwYljTjf4cT2joIyQLPK3CzLxtoqb4jIrXIlbseBcnv6S8D+5+N7uH+ZrcVhzBTQTLVGcdP/0Tt4COW7qnTN849EYd5FrJqbcWZiVmJTqsRVDMt2zbpJTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309691; c=relaxed/simple; bh=5R0DWRB8pAdMg7zzt0GXuEvR8mZZI1Vjp14kikh/KIw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rmItfTB2g1TOGajaQ6Q/EsCCzRh/YvR7yX91D/oxHlsytEVkE65DLe6nh4mznp2Se5xjb1+52Vs5Rjs/MKc6qxFfhGWPrg9zL84mCIj1EHw+g62v6qdm29oEr8wOxrWh5YJrJ38vZ+QGlN6BeyRYS5vX6/vqn7KQ3KkFjE5Edzk= 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=eYJeT1Mh; 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="eYJeT1Mh" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NGNF2D018863 for ; Wed, 23 Jul 2025 22:28:08 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=0jpyAxpI48R 1msvWfQPpUU9wgV/nArJybOguxXU5++4=; b=eYJeT1MhJJjZJUGjzDWMG5ZR0Nt sXoSfu+62XVRID/Cg4fCO2s6nKZp/mEwOcB7GV3eVUFVkpSA7zapIcuB6raOpj7I BT6cvksK63rOl2rZi1VQTtLNpoor2D483KewU2QbQS8CZgQqTc3EPEDR7v7lp5CL kn49uWuVyrAK068GcFnrX/g9y/tdLXlCQkUrDIbGW5ZwUOZn8+mg7xxzyJx4KTM3 5nhEy79jMt9Jqz8L3cfg2g20E6UMtsuzqErHkTtArek91I4SFTxd27B0xeQj182N 6awuQLz6DeM9/u6ml1SrarAj8/Vkj7PZRQtuL0+vG41dULT1JzLLsdj35/w== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 483379ru5u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:08 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6fad9167e4cso8114476d6.1 for ; Wed, 23 Jul 2025 15:28:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309687; x=1753914487; 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=0jpyAxpI48R1msvWfQPpUU9wgV/nArJybOguxXU5++4=; b=nhFPm/MIsPKVlhtrH5l5zosOmKmu/0BgCL5QzwYLLDqQ7bFWBKYIVNdb6aSl2S878H /Q+4ipin5lWD7WXs/5bz+sh9Oe+5m3mKbyeG1bksJIGV3G8gYLOsXPv8CLtFwFWA9DWC VFFbF0RtD4Av+NsdD3fEayFGHdBHfrTUsBRPwPrcTnjSJI8IsNFC8kJkUV5wJsBB3BKf ntw/snnHlQB2udIGgPeb9GWrGYiUjyZLqOHPlSpgb5QBcU1RkP4paySdkJRG3dbbE4VF 2YHXupCbAbvWI/eo0JthfDXW2xQs5Yyy+oiSHSCOKNXyOJITosVxWP0re5EFjIqN6L5P 9xMw== X-Forwarded-Encrypted: i=1; AJvYcCU58HjtLUHKXTj+HwJSh++Nmgaqt4U/Hj57hhwY42d/tI43sg5QvPXoiWetTKaYUHjzLH9G7mf5gYcEbR4=@vger.kernel.org X-Gm-Message-State: AOJu0YwC2TLC5KVtE+sT9BDtLg5l+nBfuHc8ZQjvcCM5fp0gPlhH29aK rG65sPG4EJ3QsDb3YVDQSdO2x2SuMBPNrh4d5zQQqXQn2Aw8J5PgU0XHuHySwxzX1gCstIgnPMe q0IPt/2PGEW6KldKo13itrx+iw3dj3YtlYvFU9fM0cLysUxF99s8t0jZHOLeS9aIo+7U= X-Gm-Gg: ASbGncvxTrfQfENF6QvqBMvuJdAvDxylks5Nj8wrXk/Z8AQNNyZdmVQmLGPoNI3BM2g IBBN7yA79fcE9oGS9csPpnx9bXYZYPteAg9dcnu/N7zna9N6cuuqKNw58Cif/vAwyvYY3D1Uqwg PZqnpDxtVoEitoAUBtweiBuOSG3d73MDWgPvfOikopkDPcXGtsb/bjGCwZZxbdUz0HlSgCvPpHk rvp9J3qn8n53/XKuAxj48ITcKwpGQ3XUs+fDX3JVYH7pffKlim/uXxDs9v7NMgdv0LKzE0+cq2R MUEzrop2zpk1b4JAAMBAltlpgfY+WAKbxgS6LivpvAf3YuYuM4A4Vg== X-Received: by 2002:ad4:596c:0:b0:6fa:ce27:5975 with SMTP id 6a1803df08f44-707005abd62mr63187056d6.22.1753309687180; Wed, 23 Jul 2025 15:28:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKZFM4C8iOyGySk3dCMx6hMc5W3tZ8t8wQVtWNw+VZbHduFJCRuN0EyrjNNEO3yDfmvZ1pUA== X-Received: by 2002:ad4:596c:0:b0:6fa:ce27:5975 with SMTP id 6a1803df08f44-707005abd62mr63186816d6.22.1753309686732; Wed, 23 Jul 2025 15:28:06 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:06 -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 14/23] arm64: dts: qcom: sm8750: use dedicated audioreach dtsi Date: Wed, 23 Jul 2025 23:27:28 +0100 Message-ID: <20250723222737.35561-15-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: 7eFdg5PeNbFk5V5cwWKALQP6LDcOJD0- X-Authority-Analysis: v=2.4 cv=btxMBFai c=1 sm=1 tr=0 ts=688161f8 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=kZFr1r1NR6a6C5-aafMA:9 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MiBTYWx0ZWRfX5DSnzwnga/yp 2I+5ejdunzTVm22kctyaZIHicS6Pgs3vEpbcK1SQq82nWYhquefj0gPGebKkYWvMzyHlBlnKESt lxlNMmnNpJLOvmn5jdi/TLLJrMF26zJiXZ5MrO04vnUdXC22Bd086YO9ccbc7qOB30F/xzdW+cV uCbzCBE0zpGJp4SXW0owB0yUnm+SXE+paDIs/aV/Gq2o+MnvwbQgnV0okuVPwSLsTh4FC0u7Tkl QgNw3Fxf/3aIer9h3II2r5GflZ0HagsA2KxFTYjw8orTXnaapBgibUlcfd8hZTtl+fIxbIgmz9I SvhJox92NQZsX/hN0HL24cKqBQXZJIbl7rp9OguMoxCGfLvj2twH2gkxMgJym7y+UpVYjsd9nAX U89lfiUEe1/VKZliY6dhpE+sOXfxXpZ9i4tyn1FU/PwhDzu2zZQ+1b1DqzZL237N2w6B/hof X-Proofpoint-ORIG-GUID: 7eFdg5PeNbFk5V5cwWKALQP6LDcOJD0- 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 malwarescore=0 mlxlogscore=588 impostorscore=0 mlxscore=0 clxscore=1015 adultscore=0 priorityscore=1501 phishscore=0 suspectscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507230192 Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla Make use of audioreach-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/d= ts/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 =3D <&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 #include #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 #include #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/qco= m/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 #include #include -#include #include #include =20 @@ -2194,45 +2193,7 @@ IPCC_MPROC_SIGNAL_GLINK_QMP IPCC_MPROC_SIGNAL_GLINK_QMP>; qcom,remote-pid =3D <2>; label =3D "lpass"; - - gpr { - compatible =3D "qcom,gpr"; - qcom,glink-channels =3D "adsp_apps"; - qcom,domain =3D ; - qcom,intents =3D <512 20>; - #address-cells =3D <1>; - #size-cells =3D <0>; - - q6apm: service@1 { - compatible =3D "qcom,q6apm"; - reg =3D ; - #sound-dai-cells =3D <0>; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6apmbedai: bedais { - compatible =3D "qcom,q6apm-lpass-dais"; - #sound-dai-cells =3D <1>; - }; - - q6apmdai: dais { - compatible =3D "qcom,q6apm-dais"; - iommus =3D <&apps_smmu 0x1001 0x80>, - <&apps_smmu 0x1041 0x20>; - }; - }; - - q6prm: service@2 { - compatible =3D "qcom,q6prm"; - reg =3D ; - qcom,protection-domain =3D "avs/audio", - "msm/adsp/audio_pd"; - - q6prmcc: clock-controller { - compatible =3D "qcom,q6prm-lpass-clocks"; - #clock-cells =3D <2>; - }; - }; + gpr: gpr { }; }; }; --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 7A0C727602F for ; Wed, 23 Jul 2025 22:28:10 +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=1753309692; cv=none; b=RR/yhRQtxG7yJT3r/nSShV1QH0dPJjKlEtL4+1i0G4fBcwYX8pi8ZPT8m3q9OZdOdqvb+OKrtwLJIg6FdSDG4+SHS/GRZ2vN0Ibc/+rC5OH5sGhuQHvtMdr69BZWdNMTSSudzDRwJSbnS/9XVQM84N8XHrsTZ+U2r5jhuFzCcXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309692; c=relaxed/simple; bh=yobzcPhDPsx3QmD0kVHyRLZVUVYnFWtqbqxe91ClODg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ju9z+yLjjmOxPxNVQMQ2TAk+JmjU0pfJPoeLrjTvxwR02c8/cpE6e6/Do7YR4pCSkxzb17Z+/DLzKzB8cYhOStlkJ5rs+jCN/LUM8YN7vv5u/mnrD1QJQeMmFL1ArGWuiQ2xiqPHmayUuAl3oov10iDWGRphBsFUBkxTv5c2Pf4= 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=DGz4FBZH; 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="DGz4FBZH" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NH2xB6023091 for ; Wed, 23 Jul 2025 22:28:10 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=uNoptDQOoGH 5/qbqlWTcuUXpcGcDADyQ6sTSlq+vtbY=; b=DGz4FBZHToUFYb2dYtqHAfxb1Mf BBRtIq+CjRzh2u+w0c8yyethd0+OhrxQsPwtKdo522acRs4APkHdaAayXRS2/gqQ xCxlEk0uoZElpOSP2Vvd6OwuEDkPwkkhCfQmF2IdIuMEFebzWiDgS9dL1enHqZPe 1xlIftSYyOjNXBVAq08A08WFKLRNlueWYWr6i+ScwwI6QST1ULFz/mpjSMd8iv1R tESFyssUWiKj4huKbowKA9GJdaDzoQGLrbaBIHth1PeMg7v6QQUFhD3pj5mP9H4Q mKcrEKO7JbdGQjWVtA7/auEHFSH9DENNKacLQRFqyYRaA5Lr0jRYurhRn/Q== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 482b1ud92k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:09 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6face45b58dso5198846d6.3 for ; Wed, 23 Jul 2025 15:28:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309688; x=1753914488; 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=uNoptDQOoGH5/qbqlWTcuUXpcGcDADyQ6sTSlq+vtbY=; b=UcefQa05hfxzzpcI7lYcJfWnlmqvbKwiZNym+Se4Ycz/PivqyNcfQEEDIENfSXfL53 wDYX94aZ+ek1uNmqgZ0sf67VeNvNIK/nFB/V9rHyKHOPgOfBvPjxLCKgzJoPXgWheBFw 2Cbxj0TKZ7rQxScWYf+JldYpG2Xo/d/Qwgr54aqY5aGcTn95GbnShjk5u8hKYk8vrxgu hSNXYnhh1Z9AnQMkYFSNrbscv7rclzGfEm699a1lOwPGetEoYK+w106EeznfFHRo2qV3 8dRxgHlH5OoaZKLcI6F4CyKJkGfaUGYaAI0H/AFDJ/GIflsQdcQgaqB9lIYmLb84F1uT Id5A== X-Forwarded-Encrypted: i=1; AJvYcCXpiW8y7eORGM+pBmPcmFWgz+lnhZaobXOspAQ4TF8IFHpVynxoaKc08gby9ElK5uxxj6p08b/2HfNb6rk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9T6t3/+EajdwHRkux6aXyDGumZgmb2jc8xPVRgohc4BzhIZpG 7/+PZGqX+77lwK2K5u7TXMMB6ojbQxvunS7F3hr1R8b0JgXSc+BZAFtrrMn7nsoGTOBGPCJYVM5 dbRJ4uhN/98n7yLl3v86N7xiznHBKYMrlFg2/ILhTbS6rftEejsi0hBe07NhBcxYYJXQ= X-Gm-Gg: ASbGncuPkD+RhuDTQUTqhC4fs0vfkyaPkg/0KOUxrodd7w76SzCGb/sjfnpg8SIJqLB qPvK47HLcdUb/vj3Xo1wIVOefp/U0fnTc6QZpVIZywZnVYdWOBUWlhrgsNfJQihb+3A1w1eeZ8l AYqVsu/C0uhN00hRrgC5tufbuHfcWyIDFzUOvoec4dJeZ/OIg3JGh//Y5vUS5ZMGz2rhQRn62H8 6HqFs1cge9gH35I8t8WmYs+RzDA0Cbt3C4SQznKTrM8ooIqBlAaSQnH4E/mXaY0U8nKcnYVFU3l 7IUmB7DfRYc/Ao0sfhk6ERDPj6RmPKfYmqYzR/RcnjCxP071r3lP5A== X-Received: by 2002:a05:6214:27ee:b0:6ff:16da:af20 with SMTP id 6a1803df08f44-7070057fa80mr61767686d6.14.1753309688107; Wed, 23 Jul 2025 15:28:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFA1olTvsjgTxjepYjcxQPclUkr/pDG6NmpaFEtaBbkjDPuXxMflIfuyg82gJYC8WmI1r+93g== X-Received: by 2002:a05:6214:27ee:b0:6ff:16da:af20 with SMTP id 6a1803df08f44-7070057fa80mr61767476d6.14.1753309687688; Wed, 23 Jul 2025 15:28:07 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:07 -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 15/23] arm64: dts: qcom: msm8916: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:29 +0100 Message-ID: <20250723222737.35561-16-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-Authority-Analysis: v=2.4 cv=LdY86ifi c=1 sm=1 tr=0 ts=688161f9 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=W1AQwb2gymja_ggdNYgA:9 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfXz/LdozkbhuWL A+Qu7/axKTzWkTwuF/BKcDrXpTDKF1wWg44aq9CFnnAKe3thJ6H0FldPaHkljcm6ueWdbWXIXoj x/ANQR3xahCy8wtR3u9xhqgTWeQHNZHsGGMf9b/Jiuq1tRmtAPZRSJQUT8GyXtI29MyP7ACXS4R 2jFFTCHEumZU8FwT3BU9aLauMAbEqss+G0J/YtIPlWGTH5/htRVx6HVFJRNW3clTfSNpAA8A4U+ YJ8QyNOsvspLiq0S+WfSzBVe4W1tlVhIJ/yv8jT8YkujW1+ie5pTgNoq209Uu2J9ubkEuejDYFr vZuotpdGBURNVqme5zUbGaQdKVJBInX6WtvB2rofgq7cd0rAQ/AhY9e67/CMj8E7z8WzEVzYJlq YI+YLaZriLfMmE5whUXKxIYqPxBKnxxEF/7SYZIQOhw0oB4AodhYr3cRJxcsBH+B2JbvNn0b X-Proofpoint-ORIG-GUID: 5AcwTPvkW2TPVUIT_0EDcEGLamUzfCje X-Proofpoint-GUID: 5AcwTPvkW2TPVUIT_0EDcEGLamUzfCje 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 mlxscore=0 priorityscore=1501 adultscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=584 bulkscore=0 spamscore=0 suspectscore=0 clxscore=1015 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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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 @@ */ =20 #include "msm8916.dtsi" +#include "msm8916-audio.dtsi" #include "pm8916.dtsi" =20 &camss { diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qc= om/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 =3D "hexagon"; =20 apr: apr { - compatible =3D "qcom,apr-v2"; qcom,smd-channels =3D "apr_audio_svc"; - qcom,domain =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - status =3D "disabled"; - - q6core: service@3 { - compatible =3D "qcom,q6core"; - reg =3D ; - }; - - q6afe: service@4 { - compatible =3D "qcom,q6afe"; - reg =3D ; - - q6afedai: dais { - compatible =3D "qcom,q6afe-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - }; - }; - - q6asm: service@7 { - compatible =3D "qcom,q6asm"; - reg =3D ; - - q6asmdai: dais { - compatible =3D "qcom,q6asm-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - }; - }; - - q6adm: service@8 { - compatible =3D "qcom,q6adm"; - reg =3D ; - - q6routing: routing { - compatible =3D "qcom,q6adm-routing"; - #sound-dai-cells =3D <0>; - }; - }; }; =20 fastrpc { --=20 2.50.0 From nobody Mon Oct 6 06:31:19 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 762D62737FC for ; Wed, 23 Jul 2025 22:28:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309694; cv=none; b=KZI533521Bk7grZ/kNAmZBx6v9fSrbzdS1wQTTbTfu2XaM35COmYG/y4C1gVHFupVyNQMz3284g4uGdaRrqhOZWenfpzrYlLOEgvK42Tuw9bchc2UIxv0tWv0QOzw6p79+hoCwSDuioTaatVvl5y5AfIhWGKThWgObHa/ZfR0cQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309694; c=relaxed/simple; bh=89IdTGEl1KJByV3edAjJliFKNNYIw95TE3HPTPmOzts=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ad4JcIobMuVZDNxRQxFTjLhyipHpwseUVMU/RC/Y64un7iH8GYysZNuAnY6z+69aUbraoWUo3RsNcm7O6hB1ffsfWMZTO2lCM4ig9pH86TISraNfKMcPtjHmByVstEPYPmIKU/BUkvVTm5YCQZO7Xb70lgFXb6hQR7e7eGu0BGk= 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=Z6NPux/N; arc=none smtp.client-ip=205.220.180.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="Z6NPux/N" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NH2N5G008047 for ; Wed, 23 Jul 2025 22:28:10 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=k1140a+9O+2 Qu50wuXuNC/h7aX5fpByKtVu2W2jNbBs=; b=Z6NPux/NB+95gIx9upFI8HQ+15V L1koxhr7S85+R6KjDre+FrWOGcYuicsKmPIUGQ52uz0k5xn4HbFTeT8BtBKvTL27 S9pW9oYM0k7stSV+4fdEwbn3zXMqUYVsz4Vscb/tSwp39KZos4/yVmaqxFKGiaNj rBU0BZSVUHGGwrqWXM29nG4oXKY9iWAdLYLZ6pmoNX8KB8vSpa8V0iMaJGLpXy2c uCbSQwxQoAii6O8k05zNiIn73o2wzx08Vn8Iv7VW28fiJzLA0v9wvPk9gPrBEStB 1RaN9Rq7uBU+UgT0bDprhADBTs+dxbGexa+uSgDAQLFtigWx9qTub52unrg== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48047qephx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:10 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7e03ac1bf79so28345085a.3 for ; Wed, 23 Jul 2025 15:28:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309689; x=1753914489; 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=k1140a+9O+2Qu50wuXuNC/h7aX5fpByKtVu2W2jNbBs=; b=uxfU+IVW3t8tKu+eAz6tGPEmGg1WH5ICdU+ycRrqP3RVYID43sY+RVMuVfsj3Zeobd oqjgqxFnZHPA2lSpt5/vgoVvh7GIask0Ci59LGafXPxhwufi3pc4STFTJSCnmF641p6k Ez+SQbxc/j4+LHkb99EJHSM/7Ey9yHFZsuDoNzhG3mnmbS9TZ+h0sSbrX3pr3BBK+vnW AQlZcXkXg052hNszKkZIHXNfjK3z5f2F94fmNkGQV0z6YTxVqgml5h2y4XVZfTl1KGB1 anbixMBhcGk0qwpUCtvFAsitnEU7oK5qyXFLMrn9A8aaLN/pZdU2EzKde3VwZHoSgNpr b9fQ== X-Forwarded-Encrypted: i=1; AJvYcCVa3SkFrVSDsiLch4cf8fWIaK5YkFTyp26FcMTVWqXV02oGXlZCtheFWW/zCQ82AJ+lbMEtVGwcRAb6t44=@vger.kernel.org X-Gm-Message-State: AOJu0YwqCbo+LUoJsdzmvE6EqcKMxvMhCTr64s58eIfIrnxbrqsLqJjB M/j+M3RDHH7wvmt7NticoHXWM7W4LRk/Do5HgVr/6wUdW3TtGFGUt3kB/3SPc0PmQdN9KLGFA2s tUSMzj94TiaqVQQK94s6NEO4hKcMdhBf535uMULDOfdHEqwi+NwRNr471QNkXjlZ4//A= X-Gm-Gg: ASbGncvN2y7qYOSSJWhN6gbcE7ab1gG25SRDr2C4Vy4BA/KeI0lkpWjjCxNOv4+6/aN OTv44b7k8vcQRp9RU0FwvUOK/eGh42MkSW/QMC788i+OcoYomDpO5Vm6kMh8LtbqYejxFEPx1lU vSDb5pTA3Jxkm6mLGZzBm2U5q7ADYKGtDc1ovL57xw+Dh7EJeCHgPTlrHVvWNyo1m4kwpQHh9NZ J4E/6zMbEKdCBKx5nmKWJ7OSJO63IywO5PKGVxHEWhfbFaayiDWhUEReLXRMN8t4a1WvBfBrBWN XW/w2Vcrl60t0RodIlkLrX1S06B6iVfSF6hKZZKKw7XbUQbuUN7fjQ== X-Received: by 2002:a05:620a:e82:b0:7e3:3894:112f with SMTP id af79cd13be357-7e62a17607cmr484604485a.42.1753309689295; Wed, 23 Jul 2025 15:28:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHyfHbo3ZkEJOh6+0ceiCSgzdkkDR2pY17H1wQulirVUvpTPanhXji2zAV+s1xUIjYIzSC07Q== X-Received: by 2002:a05:620a:e82:b0:7e3:3894:112f with SMTP id af79cd13be357-7e62a17607cmr484601285a.42.1753309688692; Wed, 23 Jul 2025 15:28:08 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:08 -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 16/23] arm64: dts: qcom: msm8939: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:30 +0100 Message-ID: <20250723222737.35561-17-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-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX63h1hotepmAF 5v3SGTX1s44LhSMoDXC2AZ9VnsJYk6KZyrZnXDeYI9iMIYvdh2sLEKd+LFA/uECMrK+mDgIjE7Z XDah3206YXWuKIY4k1NdBcZLxqor2JiCeUlkrUMdBMOkzjUr9/SE78/2ovSNlS4lY3myLcuoGXz yiIWZLZTmi4cEpmT0NaFZyH/ywkWwMAizVfHOLCvKrGGi4IUkmHpuLGPSNKELKU6st87qUMzmp6 fPW7bdH9n7LNZdckTCF21MJaEBXUtTZIc2F7lAHvk1DlqCPb2wRq6LPWmF/1XyrizU2TPD3+tgH 9aBKcg5xhPCSKAhu/KSP4MKB1HxPV4YjLMuYNHW+lrldy47shXerdMN5ONGrftf4WSQdi2JQBYp 57JdCzGjxlF6FgGeFTm163upCe+JCw1qFLSuGljU5ZB1+rWQQp59sj2zD/wGPfC0oCPKizxn X-Proofpoint-ORIG-GUID: OJCVuNmiGKHo4c9pA-wKD4vDvgx7DejK X-Proofpoint-GUID: OJCVuNmiGKHo4c9pA-wKD4vDvgx7DejK X-Authority-Analysis: v=2.4 cv=IrMecK/g c=1 sm=1 tr=0 ts=688161fa cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=RbKoELg_0CB1znD9PlQA:9 a=PEH46H7Ffwr30OY-TuGO:22 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 suspectscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 clxscore=1015 priorityscore=1501 spamscore=0 mlxscore=0 mlxlogscore=660 phishscore=0 impostorscore=0 bulkscore=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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/; =20 #include "msm8939.dtsi" +#include "msm8939-audio.dtsi" #include "msm8939-pm8916.dtsi" #include #include 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 @@ */ =20 #include "msm8939.dtsi" +#include "msm8939-audio.dtsi" #include "pm8916.dtsi" =20 &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/; =20 #include "msm8939.dtsi" +#include "msm8939-audio.dtsi" #include "msm8939-pm8916.dtsi" #include #include diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qc= om/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 =3D "hexagon"; =20 apr: apr { - compatible =3D "qcom,apr-v2"; qcom,smd-channels =3D "apr_audio_svc"; - qcom,domain =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - status =3D "disabled"; - - q6core: service@3 { - compatible =3D "qcom,q6core"; - reg =3D ; - }; - - q6afe: service@4 { - compatible =3D "qcom,q6afe"; - reg =3D ; - - q6afedai: dais { - compatible =3D "qcom,q6afe-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - }; - }; - - q6asm: service@7 { - compatible =3D "qcom,q6asm"; - reg =3D ; - - q6asmdai: dais { - compatible =3D "qcom,q6asm-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - }; - }; - - q6adm: service@8 { - compatible =3D "qcom,q6adm"; - reg =3D ; - - q6routing: routing { - compatible =3D "qcom,q6adm-routing"; - #sound-dai-cells =3D <0>; - }; - }; }; }; }; --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 62634277808 for ; Wed, 23 Jul 2025 22:28:12 +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=1753309694; cv=none; b=tpZush2mZAQfuiv5CreKvpKYnGJxM1xWL4mjVkCIAHe/7r7TnTCMfxrkusSrh5rENh2o7Z/bbb87H+1zaVTjsdQO7b0xjDmGQGPQ5SICDBYeJIxCP0cxZMiumyFk6FoMZB4Q7ff554HRVJQhi717bXHvU1/chVofv+xPbIF5IXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309694; c=relaxed/simple; bh=GTx0R34kmYLckUM6hD7bROQSiA83rmJbxJ+uDK2+VeY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pSCAddtFQIVUXgVZTDzcDXZSVkEvoOBTi5LcYH7FQFRwiDDPDgRHRzYB/JaQ56v5ROcJ/gDaMvlEk7YXRf405t2hcVLtLxnXllFLnJsB9AHdhL/W4xFv/31hHKxAE0iDtr0drlTXFsyoARskPrvzsANIS0So+BvUO5C9Tu5+0/U= 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=pa1z+XlF; 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="pa1z+XlF" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NGnw9r005629 for ; Wed, 23 Jul 2025 22:28:12 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=jNSvi1s7GSx u/l+ptgOXt6oOk6eqxwdm7dV/maAE0Og=; b=pa1z+XlFD2bj3L4iACotsyBGch/ tRCOkevYYRSXyiJRmxFJHOewcOoUCB4iDZ027QqIwpSEWsAh3I6m+C70b+unzlg8 kdDtFq/SOnBs85b1vSSb4iqwlc6QXGVoFaX8zcermMEIKYcLyULCmoRQf2Ttgc8C iO0z43VtWwffI5jjiHppj6iUZHFeaHtI/vXnNm0hJw4xYX/YU6k6zEiIQZoQdvoU QAW2LhkFy97aotDzN8xKWGGqUmUnM0MMhYKyX4uCWove90TxbSo5Cj+lCTVYxY9p Xq3B0xfBOuBQ6IIcdlZCUqP44E/h+Dslc6BAaWeLr0jUmPOayqJmg2C+2rw== 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 482b1ud92u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:11 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-704b4b61d10so8397946d6.0 for ; Wed, 23 Jul 2025 15:28:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309690; x=1753914490; 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=jNSvi1s7GSxu/l+ptgOXt6oOk6eqxwdm7dV/maAE0Og=; b=POQna+9pNMGMO70fLPuSipe5xCbrdrSkrKiazYhOUZdZGJzS4TYKqfHZMnFNyzXT5U x4fISYRKJvnGUsAvV9tXIwkBSO0/6ijIHxVqfPOhXmGyenLO+IR3jEH8452HsY7LJj4T 7AHhN3Fl185U2+stklsBGfedWyM1urQRI39M1UqPv6lAijsWzFRopVQlXL6bzYYSWO+y i9ZIw1KHBxl0TUsnP0kdWCI2PY+2z6+4+mZnUrB0ZjV4iIov8YNgaLoQbw/eGMo5PuQ8 g2ZgimuCR9ZwUq6dCh3EdQSb+/fz86YIJUCPlsCkKBJ4+O4rhI6euCVBa7e4dJtPUmKo w8tg== X-Forwarded-Encrypted: i=1; AJvYcCXCiTbqBLsD+HlrpVageGfLLk1G5L4CrLnA0Xmy6+iqxLb9b1ntEkwgxRhTfCt8RqsrxYvV1eFxfbkZmA8=@vger.kernel.org X-Gm-Message-State: AOJu0YxnGQEuYl5SLQUo3lTZw29FbDz4jYtqwVRV12BZMU/XrlTZ9NLn PDD/rkKDQct4Lyt1aHLvsQeKIzKgqzzWqg9F0ZTQVk8ep9eGQY6059qtOBb5/iKbx/+TR2Oj9rC GKNcuK5E5E/iekM8nrq/DBQE1640Uv6rs3VBRUbbTnS8AbmT+t2pAgrOHdLQLMspUkng= X-Gm-Gg: ASbGncvHTKi64cDimKIPMW63hDeYJR1SMxxee+wn4hw0wnHEh+KoYJG65/MkpChGVyW th9ISNgsMI8+6YTa9+LDZr8FKMp3zGvenlcz5fhgodekLhSc6+QUD/+mP2TTtP2yG8/F++6ZQa5 k20bKq/f2gaSXfHkKsL6xif+KRbZ4vzQd+EaDZATnUCgNl65MEzCK1I108Nhz1hEl5AKF9tIS// Rz8vxyibHcpM1sDjQRFVu1y9gyPpRthzkZBvtCLROKFBouB29DC0Hz2HpIYC9NHS8xbHJFyHPum oU/zofx2W83922JNri1R/WjxTLSnw1JhnCWf7ClgSP5kPNL5WqaA/w== X-Received: by 2002:a05:6214:5004:b0:702:d6e2:5bbe with SMTP id 6a1803df08f44-70700489ffamr54695776d6.4.1753309690174; Wed, 23 Jul 2025 15:28:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGD/oWYvaahRgnoZPtDPg9sEqmV5hPKh9WjSqYXdbo/TqVqlXqA44uS//aAEl183mm78gj3g== X-Received: by 2002:a05:6214:5004:b0:702:d6e2:5bbe with SMTP id 6a1803df08f44-70700489ffamr54695476d6.4.1753309689684; Wed, 23 Jul 2025 15:28:09 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:09 -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 17/23] arm64: dts: qcom: msm8996: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:31 +0100 Message-ID: <20250723222737.35561-18-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-Authority-Analysis: v=2.4 cv=LdY86ifi c=1 sm=1 tr=0 ts=688161fb cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=He3Dqnl9yZ_pUDwKbX0A:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX5KfbwbOpcx0v v+Huo8TiG+wJf0M1MMZOHutpX4ks3evsqSYXNT7yVsexhzI3ov3pSFdmfWLhuBTgvtaKwpxSIeG ArHd2Hs36IajhiUs3litXaC7xu1t00rety+ENjvhv95kPnLZOkIqDXmi4RKVs7EtJi7mXsVdE2w eDdEhgLFPj8p0JRZclCgYrZzHDKtaiiCc2/W+7X4WKzC6k8uvrxVJNKRsqI7RRLzYicEm4O94sP K1WuXeRI+617+5zJA8SvwWHKHHEdHk+p9eo26TGq7hamRszpb7A7ZDMLmVhQWwLlWmWhkptG+1D 1FcKZIUO/kW1R9jVgPQ8o/TESdaYgmWNkVQfINR5CupX+qkxd3iurK9GO8L538lmzU5gM0S/5kZ sEqCvI8sH73dYx1HrBNa/6ZSffuNf7+fY1cdGNKRTZOMRYpcvXOeCs1QVcWfOkP90cl9Xhpn X-Proofpoint-ORIG-GUID: gM7haK4EuQkr0E8PYdViNUAU4dr9VUK2 X-Proofpoint-GUID: gM7haK4EuQkr0E8PYdViNUAU4dr9VUK2 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 mlxscore=0 priorityscore=1501 adultscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 suspectscore=0 clxscore=1015 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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/; =20 #include "msm8996.dtsi" +#include "msm8996-audio.dtsi" #include "pm8994.dtsi" #include "pmi8994.dtsi" #include 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/; =20 #include "msm8996.dtsi" +#include "msm8996-audio.dtsi" #include "pm8994.dtsi" #include "pmi8994.dtsi" #include diff --git a/arch/arm64/boot/dts/qcom/msm8929.dtsi b/arch/arm64/boot/dts/qc= om/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 =20 #include "msm8939.dtsi" +#include "msm8939-audio.dtsi" =20 &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 +#include "elite-audio.dtsi" + +&apr { + power-domains =3D <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>; +}; + +&q6asmdai{ + iommus =3D <&lpass_q6_smmu 1>; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/ar= m64/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 @@ */ =20 #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 @@ */ =20 #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/d= ts/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 @@ */ =20 #include "msm8996.dtsi" +#include "msm8996-audio.dtsi" =20 / { qcom,msm-id =3D <246 0x30000>; diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm6= 4/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/; =20 #include "msm8996.dtsi" +#include "msm8996-audio.dtsi" #include "msm8996-xiaomi-common.dtsi" #include #include diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qc= om/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 #include #include -#include #include =20 / { @@ -3576,53 +3575,8 @@ smd-edge { qcom,smd-edge =3D <1>; qcom,remote-pid =3D <2>; =20 - apr { - power-domains =3D <&gcc HLOS1_VOTE_LPASS_ADSP_GDSC>; - compatible =3D "qcom,apr-v2"; + apr: apr { qcom,smd-channels =3D "apr_audio_svc"; - qcom,domain =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - - service@3 { - reg =3D ; - compatible =3D "qcom,q6core"; - }; - - q6afe: service@4 { - compatible =3D "qcom,q6afe"; - reg =3D ; - q6afedai: dais { - compatible =3D "qcom,q6afe-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - dai@1 { - reg =3D <1>; - }; - }; - }; - - q6asm: service@7 { - compatible =3D "qcom,q6asm"; - reg =3D ; - q6asmdai: dais { - compatible =3D "qcom,q6asm-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - iommus =3D <&lpass_q6_smmu 1>; - }; - }; - - q6adm: service@8 { - compatible =3D "qcom,q6adm"; - reg =3D ; - q6routing: routing { - compatible =3D "qcom,q6adm-routing"; - #sound-dai-cells =3D <0>; - }; - }; }; =20 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 @@ */ =20 #include "msm8996.dtsi" +#include "msm8996-audio.dtsi" =20 / { /delete-node/ opp-table-cluster0; --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 064CD274FEE for ; Wed, 23 Jul 2025 22:28:13 +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=1753309696; cv=none; b=GP7dnJwQ3ybdSEEcpFE7tVYmuGe6HzL8ODTZBPPKgkzuPmQayzejr+0m5WZo06XAYqMcqBY2LvirdLlU9iGLX7Zg5tws2Ke7eQrksnCT8DMKpikJ2eS6XjaSGBI/OTX2drohboVyX6qd4QjyqVzWvGJ8hUt1qcdgGQlJu1z/uSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309696; c=relaxed/simple; bh=uf2SvxSFUgilzw3JCPr59lPmRFUsX2OQLD1FLo+rWHs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gJRIlU2bI4qcDROHeoP5VknImd40rRbmhB4/tEt3ps+klV18q0iHaB36KxZHlK3DAQG4P4svO1Kie1E2izPFtw+8L3+pw51gJUDaKYcMsXpBAIN/tdsOO3rytMWKC88aqd6JbVO56yXytNoddZfCR/nz4XmCfrU+qlkVPWnHrR0= 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=PWbQYUu9; 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="PWbQYUu9" 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 56NH6lOr013723 for ; Wed, 23 Jul 2025 22:28:13 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=fb/YneAeDUu jai2oooeBHtgRqfio7LaYKhqkQgq7Gsc=; b=PWbQYUu9HYdmT2GTg+nK8n25EhP ZhNRT3I80kbQaXA+M4jNkdXB6cZW47Fd7MBpx5j8sCm67M5aY5m7cz4C64bjbCTz n3fXdbRsVBt3Cc++04Ta3FvBoF29+iuBqUbMGXpkvdYWP1nwf09tngnsEmbinMZC ZU4GkbSY7B3Yi3KGkvdvFq7L/AQoKooQ60aeLVeFrLlTRRfD/qzFgDTCw+l3AiBJ jRE3Nu9lFjFCKoVnesElomrXnPHE0mhGE1cqPtqXCzg4cWpSYoBiLnew+6P+RmEc oN6gYbVA+xR8jNkIpG4eQX86OH6YAKFvDu/t4O9Do9NDHNVumh/+dzdsVtQ== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48048vd230-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:13 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6fac216872cso7463376d6.2 for ; Wed, 23 Jul 2025 15:28:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309691; x=1753914491; 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=fb/YneAeDUujai2oooeBHtgRqfio7LaYKhqkQgq7Gsc=; b=rrC29+k61VtyiB8/tJ1KplQdJ0iY4fIQnjUmVZw5U2gPGG3mHegcqFxTxqbSjxMU9Q Va6PQSCf63Pc8aAONXxfgT/famyv8ZOrAxwS7PDkMPs/ltsbB02XmQYcA0lM3HNgJAe0 Gp9x/PI7jmSQQN7yW1Dip5hXrIQTMrJtv+ubVzSyjcgFrkumuV+m1NqEoRueJZiCHMyo YjfBoTrnYtxRQ4HfQoI6ddk+UFl3tqKzHACpVbKbcI0y8LzqV5rgdFMtRS1ZiQEjw6yK DR0CU1SpP+E3nTf0SiBNQBuAjk8ruUrQvqyelllDegGdXqQWYD8nNaHzAOZNtgir+Yvq tvoA== X-Forwarded-Encrypted: i=1; AJvYcCVryd0JXNHEnTH4JY0sWIn1N2iSZUVU9967mQTUQUE+WrHYdLsZx/QH8x5Tity8PZYsqqxA+qKP+QD33Ak=@vger.kernel.org X-Gm-Message-State: AOJu0YxW2uvyy6zjBrHQorm85VIculzzZ0BfYcEy6jxqiPijBkE/Pj74 a1gG0nIQxoskB/iJL5kJLvU7ffhIRui+FE7IxDFBe3RXaGnawXHxEFUEs9VBI+5NdHUrCoJFMJE AUv0XWosvpbWc55wRa7YDvl9JdrlXRWq+afSYwST6TQzOnZbNX4iI01RDpKtyCVzqIgA= X-Gm-Gg: ASbGncuuqIGzjhfm3JZDI3pCgnpGuPrchxKSYPCYEKAprovaYDurHSOEEU0LyUHOqcV i6HTmjJpTmXu7vSkYYnyC1XDqnsxdFO7XyHUceJtF9fiU3OV4WqaZ3PmfI8g9s7kBSjkVmjQ8m0 mfG85a4UCgXpm3boi35LviAkL7cbsCOcWnJg/mVAvoTr0oCpnMVzRRgcHx7s1DUkJm/g0G0Bc3s nPTDZlcxanruR8U7zh9kwh9OWUsIFnfK53u6VIf9Fcbst+mFJCcuQZK/jjjIlfUWER6bKz5nn+8 LcW5gLzMOMEJ6aDuKtuvRiLmPSYZGfaWU/SqNh3DYNF6s6r2+HAizw== X-Received: by 2002:a05:6214:2022:b0:705:227d:a511 with SMTP id 6a1803df08f44-707006663edmr60475316d6.32.1753309691270; Wed, 23 Jul 2025 15:28:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLdeYPeiv/7I5VkqxxCHuku7Mvhd3JyalBaOqeJ6jwBLivMIUNE9FcPwVnIQcM+ygGsLnWtw== X-Received: by 2002:a05:6214:2022:b0:705:227d:a511 with SMTP id 6a1803df08f44-707006663edmr60474966d6.32.1753309690706; Wed, 23 Jul 2025 15:28:10 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:10 -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 18/23] arm64: dts: qcom: sm6350: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:32 +0100 Message-ID: <20250723222737.35561-19-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: 9Vyb0W65iDzRsDcT0_juqMGXfPzYOii6 X-Authority-Analysis: v=2.4 cv=SYL3duRu c=1 sm=1 tr=0 ts=688161fd cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=R7b-5tlmrD_1Gdgo1VcA:9 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX/DuC9Kz+EhXq 8dhCtTQNcKB55gMTDE3wox/Bxe9/Dy9MDkkIb1Jis39DkN0Md/lciiH6y6iO94zrRzdV3jJe5YW UAVjtnvfHe4+4Uy5pLlZgvPOIL0xt8TqV7ftYbzCCqO3onAShRlDTeQBdAbEHvf+PP4NVcr26Mm bNoY0nU/asQFlVZrUXP3DbkV3E9zXQN9nTMH98lqRGY9gD4vdbBWoD6EH4rLDQlvuOy1S6fwCII 8VT3K9GFg8IAevZtVFPz9cqtbBs5kNgAJMqcUP3AVch8TihXjFlmrM431nNOTUjn6TjLGM98Ytc 6hNYo+6U5wHfWTPxjIMG/3wycRlX/2TgHy9fdypKh2aFAS6TpYL0eKqjMCBMUPHQhEI1OAiCZZd DBHEYR7Um/vH9iR4B5vdq1aa0DHGK4DQ8WTb9CwbBCra/dYoBgXEhPpXIL7FZ1R4WRrTveqm X-Proofpoint-ORIG-GUID: 9Vyb0W65iDzRsDcT0_juqMGXfPzYOii6 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=765 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 Make use of elite-audio.dtsi and remove the gpr nodes from SoC dtsi. This move removes duplication. Signed-off-by: Srinivas Kandagatla --- 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/d= ts/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 =3D <&apps_smmu 0x1001 0x0>; +}; + +&q6afe{ + q6usbdai: usbd { + compatible =3D "qcom,q6usb"; + #sound-dai-cells =3D <1>; + iommus =3D <&apps_smmu 0x100f 0x0>; + qcom,usb-audio-intr-idx =3D /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 #include #include "sm6350.dtsi" +#include "sm6350-audio.dtsi" #include "pm6350.dtsi" =20 / { diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qco= m/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 =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>; - }; - - q6usbdai: usbd { - compatible =3D "qcom,q6usb"; - iommus =3D <&apps_smmu 0x100f 0x0>; - #sound-dai-cells =3D <1>; - qcom,usb-audio-intr-idx =3D /bits/ 16 <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 0x1001 0x0>; - }; - }; - - 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 { diff --git a/arch/arm64/boot/dts/qcom/sm7225.dtsi b/arch/arm64/boot/dts/qco= m/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 @@ */ =20 #include "sm6350.dtsi" +#include "sm6350-audio.dtsi" =20 /* SM7225 uses Kryo 570 instead of Kryo 560 */ &cpu0 { compatible =3D "qcom,kryo570"; }; --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 4710E27978D for ; Wed, 23 Jul 2025 22:28:14 +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=1753309696; cv=none; b=GOGA8yHuQUiPRwGGznKnrRMrkw0MjTX6J3LFc0Abw/oIIpuYM3WEW08hrvBAaxoJO5TRDTCJnEP435sLz6Jscn8Be4+ByqYp4C9iVTJTT7F1cyvgtuy+wcZQZGgAi/eZlDqqiDW8jidJwt2IGep9mfLdgkKqMjWfjK2z6zoUpqc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309696; c=relaxed/simple; bh=ykFPGrPOGWnGGhIHHDP+d7MLZZdfIM2eAi2YS13Bh8A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XVxiOiE/Jw0/RvpheN80v1V4APRJnJcUteDqnOa7tYwodkm+kYgE5XBtg4nBapX3ObuL2/NbvFVsUFcU9DdEG/DOn6CHMKmEotPFUU8mIE36WEHyE0idu1Yvq236QZoCK7xg43PXLzETt/ONfPtjXstr1kQd5XZedwgiV8LzgCc= 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=nrUci/AT; 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="nrUci/AT" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NGnw9t005629 for ; Wed, 23 Jul 2025 22:28:13 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=hzMAWZi234T Oa1iw8DZ8oSKgpkGFxc2SxfIjqDIYDnc=; b=nrUci/ATm4HBY6LglW081rR5OOB XDauZn4S+RbjKeg1wuOl5wngjLT9ZNJs3/Qq9CBMQv2m1PurLsot7Nsfiig5eYt2 pCYTw180GgjnUsZjwkhHYWuvdPZLEFeKjSMjbWelwim3BFA6zpZYPepQSh1dau15 YMSoj/4t2ybZnZeEJFUqxbqDkAUTgw+DymROftLHX/NdHr7z9oh8ObktyK6DKQzu FhQQgP58GnwrsNRzn8UAVjjErqST8sDY1q3qQq27Ob2qnX4X3ddzJ/mxntmblqKl zr9ykfvcSVaKqjdzEs/VZoMe195Rrqu0faoKKjFX/9SzKGeN+HyhGq9y0kA== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 482b1ud938-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:13 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6facf4cf5e1so5898006d6.2 for ; Wed, 23 Jul 2025 15:28:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309692; x=1753914492; 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=hzMAWZi234TOa1iw8DZ8oSKgpkGFxc2SxfIjqDIYDnc=; b=xKbUUDuK3ilCoCXrOIkSTxPIPzd60JftkH0iu8CPXppXP9v6zJsTfq7x/YDVpQWUQK 0xjzeLCI7qGmEjgGjlBz6uEUOAaESpKN+tecEiBpAuccyh3G2ICIIaax4DvVD1kokjBU crEktqCiaHhkkwMOM9tKL1TJIJv4Xi76Fq01qrdbEQxhzxF6lemMoyeuMT6rhKP/MkLg eKCj6yacpu6xtPaceQWvAVEkcBNyFDgdgC94w7J9EmGfoNzjBlr/MLWHP29ckF3S6sti 8VFZv3tB38x/3TMfgyeCOdhSt99/BjMTOVj7FyYDY+TrrfWQBtHAZmSEPX05cuAZu4mq T/5A== X-Forwarded-Encrypted: i=1; AJvYcCUGtLLlUHThxAu+despimLp4x71eQTaAlhN+pVlV0gEGjqz6Yk0hEKJVrZy3XU9gZagWvKQ6L78ENUYo4U=@vger.kernel.org X-Gm-Message-State: AOJu0YxiLLR5BouEKAFemSzpVcCEHF2szPPAKuw792Cru9H6UM71+0Dy a6fLIcEOYp+WGIDpJ/PUOT2liqvo6plBlKZtO+d3eiCmK/ORbxZSqDxJTM9//By12TK3jHmdtMv bguhkT85UwQjEvUlEo59mi/8IGpBURH3dkkkbFw42QPYrzJ0jpzODBh/sScjgV7X/0F0= X-Gm-Gg: ASbGncvTwk7rop14C5rsxl941kFgKST+ajpaQ3eC7LjjB+Bub8/s0Ogr67cQra5RDnp fnlQAjQTif9wZPLroa9rHWGwaj5gyOmhgDsEY1pSE3/Lnv5Ae0HY3h50IaBmLQKShmG1u41Srrx iOz5Ltegp4UnwHm5+G1xs6bWOBXn/gSdldVs6skv6gL1a/tuWgT7HIKVRZBRydgAcvQUoVdfAsO SHo8FXAUdIrQUcRdBbvk2ubUgpBf3b/sC/F3L5zFqyT6mvBIDQnZqXmW6Lcm5EItkvpc/wBKqSB PbdNzIQdEobcD75p2TTbyihy8UgZj2yAwRaee7DoaNmgxtio8QrYDw== X-Received: by 2002:ad4:5c4e:0:b0:702:b805:276b with SMTP id 6a1803df08f44-7070057686fmr69408316d6.20.1753309692057; Wed, 23 Jul 2025 15:28:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGyWUlhS4LFAGc/+dCYOgVXZ2FICM4/uGAeN9BFF1rIG5uhfUvUMsWIZYEPZHPu6AVe+2WrWQ== X-Received: by 2002:ad4:5c4e:0:b0:702:b805:276b with SMTP id 6a1803df08f44-7070057686fmr69408046d6.20.1753309691665; Wed, 23 Jul 2025 15:28:11 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:11 -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 19/23] arm64: dts: qcom: msm8953: use dedicated elite-audio dtsi Date: Wed, 23 Jul 2025 23:27:33 +0100 Message-ID: <20250723222737.35561-20-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-Authority-Analysis: v=2.4 cv=LdY86ifi c=1 sm=1 tr=0 ts=688161fd cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=NUy_n2JfxoLtk0-vLF8A:9 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfXyJuzRoc7zKmQ w2tvjCzN3DqKW5M7o+f0/xje2k5hGkU5f52jtXj6kQBwLmG3odLXhqtTdinOT9F8voMytwjepUW abjBvhEbaHW7a7/JJJqMC2TT6IMb7hbSTwfJwbTLtGwKVmdxt9PwlmndQHsbX7l8/GdMOWkYcjf VVjJWnd0yREJf7fdyCbvvvcl4On92xhhzyxApbZFInRDnFPlYqnN46jq/yGkJX4K1dw0DTjrWxY R7PVhPZzIXYgxB0I1JyGS6b6lIptZk83hckOa4ccR8HNdirKxgTuxBRbdqcAGH71Ryae6qZlo6e 2ByVCKqdbMAnO5kKiBXEhxaP4fh/2XAjt1F+kUCiVn384nCWueDGsSsRt6OZft+xt1Yt3faqpw1 AJrlaEOAhT8mMu2CqkxMEKZUB1l3CsGdmhwO9zlReiad0EjiwLfMrK/vgr4ud7QLYE/gQN7d X-Proofpoint-ORIG-GUID: uG-NbtqdZcaln0Ke88lzYzcjaJvhZqNJ X-Proofpoint-GUID: uG-NbtqdZcaln0Ke88lzYzcjaJvhZqNJ 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 mlxscore=0 priorityscore=1501 adultscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=682 bulkscore=0 spamscore=0 suspectscore=0 clxscore=1015 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 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 --- 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/qc= om/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 =3D <1>; qcom,remote-pid =3D <2>; =20 - apr { - compatible =3D "qcom,apr-v2"; + apr: apr { qcom,smd-channels =3D "apr_audio_svc"; - qcom,domain =3D ; - #address-cells =3D <1>; - #size-cells =3D <0>; - - q6core: service@3 { - reg =3D ; - compatible =3D "qcom,q6core"; - }; - - q6afe: service@4 { - compatible =3D "qcom,q6afe"; - reg =3D ; - q6afedai: dais { - compatible =3D "qcom,q6afe-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - - dai@16 { - reg =3D ; - qcom,sd-lines =3D <0 1>; - }; - dai@20 { - reg =3D ; - qcom,sd-lines =3D <0 1>; - }; - dai@127 { - reg =3D ; - qcom,sd-lines =3D <0>; - }; - }; - - q6afecc: clock-controller { - compatible =3D "qcom,q6afe-clocks"; - #clock-cells =3D <2>; - }; - }; - - q6asm: service@7 { - compatible =3D "qcom,q6asm"; - reg =3D ; - q6asmdai: dais { - compatible =3D "qcom,q6asm-dais"; - #address-cells =3D <1>; - #size-cells =3D <0>; - #sound-dai-cells =3D <1>; - - dai@0 { - reg =3D ; - direction =3D ; - }; - dai@1 { - reg =3D ; - direction =3D ; - }; - dai@2 { - reg =3D ; - direction =3D ; - }; - dai@3 { - reg =3D ; - direction =3D ; - is-compress-dai; - }; - }; - }; - - q6adm: service@8 { - compatible =3D "qcom,q6adm"; - reg =3D ; - q6routing: routing { - compatible =3D "qcom,q6adm-routing"; - #sound-dai-cells =3D <0>; - }; - }; }; }; }; --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 DDA9C284B26 for ; Wed, 23 Jul 2025 22:28:19 +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=1753309701; cv=none; b=QX3xQ5G6U/wqwY3vXqr6PLoEqOSy1twgr73iaNt/E3lNk3lEsXpuApivQNsvZ1RA3BOsTcomqJ0FuEEWYpCMW+/tYZcV7oGOG9JWCx7RAu9YMZ0W44ihwxD2LDaUt20dX0f+CrAUTNBLpYEbKNp4DScDjg/9tGFmlxaw4+23dVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309701; c=relaxed/simple; bh=D3W+0VC4PAlVH4emFw+f9hnESmnnidbvOLACGA+ZUSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s1dTS59xfPoJiIDIX33bPjYqY7hFBJNlxxM0xwflgZv0fbXRGtLjci5lYVU/MMLDd9Jz0dXkK5f6TYiwpHziGKxqOxadJiMzzlC7rPwo/Hd03Bwug6CuefoBHxhCjIGODmVokUXGAPWFI5laHWWlzhXX0ivczk4++OcYRnRqj2M= 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=YsDbD06E; 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="YsDbD06E" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NH3SoB009376 for ; Wed, 23 Jul 2025 22:28:19 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=92LZIjDLudm 4UshzJZBlykikxYDTfxT2SEdJRgplJ+A=; b=YsDbD06ErMWsQRRQBAtkuj0og7O 74bdVOONVwb9vGTPMj/OFlM4weReTOh8Nlc2D6z/1FolLKOGIMqgvTWLiCQCSJC/ nEQfZ/Dri/JBqVnrvZ4S7I6sWVt0J8RHBF1XMVitQ6iikPu18b9Dep5sQIpNLjzm 0HfS61K1BK7s6XHxWA7jZMTy8qYOdpZBFYxLFNgEE3S76NE6LB0KYS23ld1QWoLZ bT1Y43GIIg4OCGQ+F398rQE/I9qmm4q6D8OkXoWi+vkvHxlW52X0pe4bD5cLK0Qb 3jNR+/zl8IjmGxMc62Ztrh04kpnRM3uZAMxYRKwZFbLEDB+9KnbUO/UwmoA== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4804na555n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:19 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-704b4b61d10so8400126d6.0 for ; Wed, 23 Jul 2025 15:28:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309698; x=1753914498; 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=92LZIjDLudm4UshzJZBlykikxYDTfxT2SEdJRgplJ+A=; b=JGRfnfvV9G2623sA1CV27QTc2b6wGGL2VFZiLJtxcOQvDn7j24r4QyVuHKyRcdSEAX MEumh9tQfYlwsaC4er/jeQTi2dMIMj55SgGwr4fp/UZy7qagRpf6FAVAe5F2FiE3gdLg H7CDijZz54NFp5cKJo4WB/k8tp24CJV7sW0CudfL/tS7SZLlcrEMcBXeNbtRr0Pi9HGH u8C5jsFG9A75pceXmAOTxcmHrWN7kvSOrQ4iiXC5bNEI3bt+l6KFiMD4mJR6iSU1/mdV 3bF2CsBQRbKml8Om6OaMGQkjBTAHUV8+MnO2XrOpTp9kd2GtKnHkZvb/3RZqLSLadEBs oXXw== X-Forwarded-Encrypted: i=1; AJvYcCXjm4hpqGx1jK1vokRrNGv6j6ZMD6W8HRqWTmqvPQwYAeY5txK3SX9bSYlwRh4fqDY1coUDDvj5SXXnddE=@vger.kernel.org X-Gm-Message-State: AOJu0YxlLctN/OoFHB/dcMbcyddfs04sQpSm1rh5eFQELWXQwx4gvEEp Gecprtfm4mTxXVLhpA9QdVzXrQqZJGofdme/GQBs0gOKXWS6ebbogcnP1Iurc4YdEUnUonnKAAA nBuYxG8y5Yuo8cPIUiI4BGM6AcXIX3NEUjzGGNmE8cWWmnhUuHbnT/9eTY+qarHnbMs8LjnE+Pr g= X-Gm-Gg: ASbGncuog3E6+mQRu7BaXka8y9X6ZODAiV7t36ayp4rw+wj4CsYSWaLElimMaT5qv7d Xla15DtAeCdt4iMdDoXIs8IrQLZq3imCqDC44ucD76RtQFrMxkInh6BDfZ0xnlM9c7I+XIsN7OE cFDR+XkoXQ1iAH6hFkKK80uchuKWQm5kQ+DiAfh7BaW6RTqAChGBFZtxX1mCUBim4IUx96aQjri sJZQly3dqjMOo0Po6L7PXQ62s8SXWgb7RBp2UtiX0MKBcrEyEBMYlZi3QO5nrkAKSxlsoiP8k8y o9x99N+QSSWrNQXA1pYHkQOHEvPqpRLKY79Qf1ID5NFHos8d/5Uw3g== X-Received: by 2002:a05:6214:20c2:b0:702:d822:9381 with SMTP id 6a1803df08f44-70700517288mr83901396d6.19.1753309692903; Wed, 23 Jul 2025 15:28:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMJbdQKbGqQxac6lcBgDoO54/jpcGXQ9pHQCWa1LXoj9MoBYavd5YJCtmOj46kdsKsTFElLw== X-Received: by 2002:a05:6214:20c2:b0:702:d822:9381 with SMTP id 6a1803df08f44-70700517288mr83901146d6.19.1753309692550; Wed, 23 Jul 2025 15:28:12 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:12 -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 20/23] arm64: dts: qcom: sm8450: add sound prefix for wsa2 Date: Wed, 23 Jul 2025 23:27:34 +0100 Message-ID: <20250723222737.35561-21-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: joYTQKtubnTjpkflNBUHkvEd-Z2fZqpA X-Proofpoint-ORIG-GUID: joYTQKtubnTjpkflNBUHkvEd-Z2fZqpA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX3zywRPcX71op f5UdiZzLpcHHxe6tPkeqeBdBzlPRoaTut6dwKRUbvAWpCsvJ2krsy8hbKzpcydSiHkj+4wa2aWN PntdVRAMGMoG+EEoyFjH3bjIYfMhRqLxRXh0P/I3q7GlKD8ek4wItZddqAlzsRm842HXXW+F0g8 bmO7+eRu/1G41WCYmC4csg0BduF92rX+FSi01NtPs+X16y8fjJV46uLGu1Qx6KwfHYkBlIVEVcF VHz5qgScwO922Ph+p/WEaYeo49Uth4oxIHQtkdravKdUykeQKOND5PR9Fsub805pybVuaQkXBEc e3W6RCi/tWPXV2cqB1NrviF7LkBWJPc+qzVc+mDhzgvVhNveP5PctH4+muUZDo34O/iakcuwyZL 1XUqMVVSpOLalcg24hY8U5BcszXHM7JK2ZyVQtR1eb1UoahO7usRiARcyn/+qFpn5lq/LuDi X-Authority-Analysis: v=2.4 cv=DoFW+H/+ c=1 sm=1 tr=0 ts=68816203 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=Nfxnn_ge1f9Pje3RmyYA:9 a=zZCYzV9kfG8A:10 a=1HOtulTD9v-eNWfpl4qZ:22 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 suspectscore=0 phishscore=0 clxscore=1015 mlxscore=0 mlxlogscore=797 bulkscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 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 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 --- 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/qco= m/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 =3D <0>; clock-output-names =3D "wsa2-mclk"; #sound-dai-cells =3D <1>; + sound-name-prefix =3D "WSA2"; }; =20 swr4: soundwire@31f0000 { --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 331EB27E04F for ; Wed, 23 Jul 2025 22:28:16 +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=1753309698; cv=none; b=XWYxt35TptozMG56Hw49yCua6x5NPF1D7C6vhBM7zVuG0kALqcscd7cuClHea1l7ibTs3HselxmT3He87vSs+k8ZdmsxGYSvEV2ZudT5aTHyLFoj9AmNkTwtZFopp1iPyByAfSjggHboSznSXmFzC/Y7GDbBy93J9wyGbaHcXQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309698; c=relaxed/simple; bh=zYF2GQzOX7UoU9RcPjJT84Ey9Vp+O+mZOIRzMyW3cr8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=inDawJ4RhvR6a+CWCzx2vxVOWPPvL3ndXjCeH/GRXhYRAB1Z0JbwTb3+Li19zaSnbhGDqZPuT4CQOoeJAtdxXSQBgoYcvDlqBzNIp5iUDkY7V5UkqOWmqfUsDKmgvgFXQRUWdmME4u1iLrEjQxdblPXNQWEzwgEDDfzIjcipTCU= 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=RBTVc/pY; 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="RBTVc/pY" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHBIt9005191 for ; Wed, 23 Jul 2025 22:28:15 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=XkLhLpw/zbA 8rKihC+Ls2PIVo2hpg7LCRAqY62Ywf5U=; b=RBTVc/pYQAVNIU28sOIJafv7RVA dZUd33X+yYnNyNDoLf5/MqTGXz5EpsSH7Ep7VivvuOLHNRfmGOmWuCTcSnEHCBbz fJq0p96UQCbv7COH8uA5SHZNIVvm6aE8MXlZwbOwJ2DkP5uU18vYfUdU5g+r+pho toT3exT1WiIdy6o7f43ZcVI01ycTpH+pMCPa/7uqytCH9Yq9XnxBhhUwc0NPENDK T1LV4ml9elndit28cGieoNmwRnaGSE7jqL7RXSpWKGusGdJoCfGPdWNo2RqKESru /+5qgy2tk0OC8iezFN/ux79cQEvRbDtKJBADNsi7yGdS2CqTSe4jMmcjcyQ== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 481t6w7uvw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:15 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6fabd295d12so7289246d6.1 for ; Wed, 23 Jul 2025 15:28:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309694; x=1753914494; 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=XkLhLpw/zbA8rKihC+Ls2PIVo2hpg7LCRAqY62Ywf5U=; b=J9VJcUeCDpRnb2fkEsjO5XGo1uTBimoIoFj/xqeD3E9p7X3RCTmEqILKm8Uy13Rrvt 5Bm3df3OCHahaVYOWPawjMLfLfmvjJ3SuyB9DwrmoanD7gUNJGxlWpWGh/Ghi/v0TNqw 7QjUTW6xODzvTnj99LhnlMb6ODik4Zq8Bk7YX+DJWFQgxLi2vyCDip5av5hL/zG3jQ2f buKLyCrL+0OkRpBgqdvb//uhYKw+cZnJQdneRAyz7DHBNgIhf1Ft9RSRVBFC/bh0g34M S/S1n3Af4FPd+15FKt0dXpDGmVGp73i/wEcGkmNNy4uQbusKtoEIGT+5adt9BGIauCqA zSsA== X-Forwarded-Encrypted: i=1; AJvYcCVdIr4pEYKxa4ffEkI8JS6bmqrd/NoipGdf62Qrgwz8ER55ckJY+ILMk7zbZ1wy7iSOOBwDY2JASG7E5QI=@vger.kernel.org X-Gm-Message-State: AOJu0YywGanZDcHSFmDugRoq4FxQATQ/q26fx3k/BQ0dgYR9YOr6JJSt pmCcRHPF4Fi9n+3wNpjmo3Aw1f6i7Wqbk8I4Liz9gf8Exef302fwjTS+TF9Rp4fdSip/B7xUIA4 kycX5miMG3ZfsaHDIX+ybjsBMRbM9luaA+Lx4Zwxiij4vi2qE6dtJw+0vktlc9bMbBPs= X-Gm-Gg: ASbGnctszL1USikVCiXz/RBw5bTCI5NXCZrkX+H293tkLwtjfAkz4JcDM8k1zq49hST omrvzXZedm1YUp3RAHOOcwAXYwpRopHihFvtpePAxgv9PfjIz1fQ5q6VrCGn0WXzIjrUe2mzFz0 8rIg2ucZDSoobSy0gIlzncE9oLfo2K2qsg73zceN+BYh0ZWwVP5qk24wP92qU6HYzVFx29EsSC6 hJccuHWA6KuZCMQCN1MM+U6YyIylLKicBDthxZP8M5Gjym3/ZJlRHR2LA80Crt2QRM5cfm0HIoo ASiJ1S4HEK3cRqaZBRqBjgrwY9agQl6iR7TZAUEhjc69Km4XTr7IUg== X-Received: by 2002:a05:6214:e41:b0:704:f7d8:edf9 with SMTP id 6a1803df08f44-707007104a1mr76741536d6.46.1753309694055; Wed, 23 Jul 2025 15:28:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGA+u9kqKlJeKjA99+wEjnn/wxztrEfMRykSn0vSNeVKYrs1jCV1RC5Qvq6ovGlFrpAVJTfdA== X-Received: by 2002:a05:6214:e41:b0:704:f7d8:edf9 with SMTP id 6a1803df08f44-707007104a1mr76740976d6.46.1753309693475; Wed, 23 Jul 2025 15:28:13 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:13 -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 21/23] arm64: dts: qcom: sm8550: add sound prefix for wsa2 Date: Wed, 23 Jul 2025 23:27:35 +0100 Message-ID: <20250723222737.35561-22-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-Authority-Analysis: v=2.4 cv=SPpCVPvH c=1 sm=1 tr=0 ts=688161ff cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=Nfxnn_ge1f9Pje3RmyYA:9 a=zZCYzV9kfG8A:10 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfX5+Mjye0VAQm0 DS8HS7uF10aJdIn36Swhl3n0u0Q3BeoW4KlYQH4TCv7YWviybJF2EDyTvX4WqYOtj78LpazmMam 8vuOThvjp0GOzjN6GsKgPXtRDVGL2yVpLQ9e7hGPJNoQCqyoLLrbfiV3fm7GGchTdYVlzDq7suG /hyzWMLJ7DHvjuFYtRqSPPTiJ+fulY5SX/AoKXZY6WGvb2u2lq+rImVP3ea0oMszOAekkvZK8Y8 3b5/NCtHfEdHLI1LgweUnQGTL+jI8ai0qzvsZ2Ddxr7bAPYAArb8qT4Y5dDbLhAgcTlBiNGaRhn QFeNaB71Fq2UXXA4dV390Zmkkt5tVbKnwd5/Wg0i59qL9fdMo+CKAagZUKEmDJRBTV4+AYI+u4H SN8ybWGd7mxfb1U9R/8o8nKwtiV/9ciaIFjHFsktHjE9GefjM5u6KflRWUuo0lRciHMqd097 X-Proofpoint-ORIG-GUID: tt3lyOvHdXzkeIa3xnSbluXtgaBgemb9 X-Proofpoint-GUID: tt3lyOvHdXzkeIa3xnSbluXtgaBgemb9 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 spamscore=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 lowpriorityscore=0 mlxlogscore=797 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 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 Reviewed-by: Neil Armstrong --- 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/qco= m/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 =3D <0>; clock-output-names =3D "wsa2-mclk"; #sound-dai-cells =3D <1>; + sound-name-prefix =3D "WSA2"; }; =20 swr3: soundwire@6ab0000 { --=20 2.50.0 From nobody Mon Oct 6 06:31:19 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 9AA7827EFFD for ; Wed, 23 Jul 2025 22:28:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309698; cv=none; b=OiQJwfX0oDNlR67T+F2Ygialek2FIQq6W3zmDP0P41Fi/kXfvkzSCK4cmzQxnKt8nxuB+70HuXUCZWs4iIv4mDpXIv+/97O8Hvkn0o8i+ACNdwmfu/emRhqsQyxkGvRdVkI5NEl8Wa3dZky0gLeL2v0s9YeOBC0cxXj/Lcemvt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309698; c=relaxed/simple; bh=W1uXbTmsNMhMMyXy2Ux/32rAxYrWnHpU/nitZXsHqjs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tDYU1OGBUTHaWtZTK4S7yrZfHocMHZHzjrS2dShxqT10apnORA8F6AyuqC4TU302vjA/rDbOco3eu3NNXtBOvhQqAR8PZcI++BZGNv+OLCXroCPX2OgIbkn7NmQ/+NZulODcYz8WGJuDSH4RNPNVLDXoUjM6wFWvrqQyHZEyU08= 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=LpsmPp1k; arc=none smtp.client-ip=205.220.180.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="LpsmPp1k" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHm2s5019487 for ; Wed, 23 Jul 2025 22:28:15 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=UurPSuwLvsQ 5NrNV5gLdgbM9aMVO09Q2yfwt2uIkKvE=; b=LpsmPp1kLv/hku/pyPACK97F9gL 0ONHYTHM8jRttthh9yJzgQ+BQmqAgcVVbYQ8ZmLutw/wPmkKYayU/iu69PL8z0lb Qbi3h47qNyhpHcIVThh9Gq/1+FsvqtZeX796PYpQYuy/pRZPmrJwMXaZX8/IF03q DBsrcJ6pnv3mi3gK1YbVj+IPOyWrBSqoan5FxaaBG+6HheAuuH6CHwYf5fMvVV0L tslx5jnMh0nMxM8DI9KZhF+lOu1Sk7jzh0pHklv7tpq5SwxMIUomnsexw7viCC1c YWeVtAM45UwDGdOAlXJACB6gpx29cRBmBETidSewc8JW2CPV9bVuMh4XNKQ== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 481qh6ruyw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:15 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7e347b1a6c7so102669985a.0 for ; Wed, 23 Jul 2025 15:28:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309695; x=1753914495; 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=UurPSuwLvsQ5NrNV5gLdgbM9aMVO09Q2yfwt2uIkKvE=; b=DbKQ3JO9Bu+AZdh16oS3B5hy4qOOuVKHW+uwy4R+Hs5dDzQm4SbQ9e4X3Ei4NeLswm CCSyHMrcn8EPrvgRdRqlZ1iBS23NDF9THcrlm/81Ws94Zb5Ei5nXRaljyHEf1lhPut9G UAZHQD3rx9WfAK80fnVqc8SZj1zXdbE6nUfPGdzVrOWag53LaKI2pd+53z7kM2VX017p crWXDwchnkDCTYhh08wmZY5NN1UtjsQuWTfI8iuAE9VpWaoXTFVhMMtktAWpuOACpjDw 5a/ngr+NKCpKSdIgDIgtkXCrpg6engrkwso+6zKcOP/91uJHw/zKPOCYZok/f4s4YLTi ChtA== X-Forwarded-Encrypted: i=1; AJvYcCXB+yi91UdIJ6eraWpJ3v3yl0/5Em0k8SPaBkMbdsXSJvKKYR43KOSXqk9N1KuO8tbyesAoHYuYPjpB9QY=@vger.kernel.org X-Gm-Message-State: AOJu0YwElXoFkL7fu51KLFp1/lvbWWWo+zw1+/OrTFRPWKmt4UThXe1Q kKdtT+04P/CdHTsjk2sy07HOugK4E7tsMoP8cXwH8V+UTcjlgJz+8cR8+1NMACHJV328AXVqIKu OElb7HnvEbRsb9t/xjywYNIDVuiuk68AaL1qenJgXYLEnkKNvuWIkFZ6VshePG5zC6Z4= X-Gm-Gg: ASbGncsrm48KEjbUNeLS3b6L9lf7gwm71xOISBTYMPnAaRC10Q3g1y1EUETe7r30iyN XluA+l7X78MPYgDEqvaJGGwJZGPNQMkcEHjfwNgmB0zBatH40EsuglVRsQBCr2Xwa5P7BMDF8aK PBZIOf9E/t0BOdMOyaytFGObacx2FsCTgDCRze+zFV38kRC7Y6al4Q9FzYA2SsXd8ljfBdvDkvI pini80p4/GLRRrShc79DqdCtQ77q5xKxbxe6EEw33pxdo2DtV/1YSl97iBEvhUoCN9lIICjK5GC fD7pDO6HAVpReJlR2Nv6/MdiydiBuPOvfBgFm6vhX6LljrQHTp7/xw== X-Received: by 2002:ad4:596c:0:b0:6fa:ce27:5975 with SMTP id 6a1803df08f44-707005abd62mr63190636d6.22.1753309694808; Wed, 23 Jul 2025 15:28:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGp6Ef75jlerxYrMg+FmKFlFarFjYWrfMy1DVApQlTuEoJtqEvUFn5ycjc6wY02nR5zJyHjvA== X-Received: by 2002:ad4:596c:0:b0:6fa:ce27:5975 with SMTP id 6a1803df08f44-707005abd62mr63190396d6.22.1753309694411; Wed, 23 Jul 2025 15:28:14 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:14 -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 22/23] arm64: dts: qcom: sm8750: add sound prefix for wsa2 Date: Wed, 23 Jul 2025 23:27:36 +0100 Message-ID: <20250723222737.35561-23-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-Authority-Analysis: v=2.4 cv=CZ4I5Krl c=1 sm=1 tr=0 ts=688161ff cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=Nfxnn_ge1f9Pje3RmyYA:9 a=zZCYzV9kfG8A:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-ORIG-GUID: ccqeCMmxLcFtTerteiOw7F1L-Z23u_H4 X-Proofpoint-GUID: ccqeCMmxLcFtTerteiOw7F1L-Z23u_H4 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfXzURjcp4kqCj/ g/2oNaoh1ZkXijdpbX41WckvLyukn1YSkVFCM8MOMUJybK5xy3utsptRkKt5A0szxwdE45V1pBz t0g5HH97JlAeLY6h65kiefEOQwMR0VW++5l/fGLb6LA7WohILFqiGJ4avlOq6VfZcsDFymCL8+Z pxYIAx5k6/SkEi+3GsxWkLBMZy65+nkl4NcKoLp7+eEFmCoFrMwhZIEE/SmnF0ol1udGmsnlafw tYHf2GCACq71U0vYpoQyIOScW6jpojKYxbdiVcKawd5WSbN9/qyZZ68iJsHrq+kuJsvTbj31Ja7 i1msedTFpx1LwHqUDgLhSTPSreCLYLpGTJwq5oGZGo9YBMUQ9dnZqMrEUyLC3dacRNBF34gRwkI Sk2dTvTjicFTYb+efmxuMCKac+xjA0PT8GOgyyXVJUISUUWhQFFMBjZtpNjaEvGFH6bqmmAh 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 priorityscore=1501 suspectscore=0 mlxlogscore=797 impostorscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 bulkscore=0 spamscore=0 malwarescore=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 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 --- 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/qco= m/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 =3D <0>; clock-output-names =3D "wsa2-mclk"; #sound-dai-cells =3D <1>; + sound-name-prefix =3D "WSA2"; }; =20 swr3: soundwire@6ab0000 { --=20 2.50.0 From nobody Mon Oct 6 06:31:19 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 42CD127F015 for ; Wed, 23 Jul 2025 22:28:17 +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=1753309700; cv=none; b=K3VbmxEdPh1nJP/zcKs0EAZMajXLVzYs0RMLiZIRkwQPFVmStwVjSKcov4BOsnN8Q3kef8g8qkVdQUbkOsmHk2k22jesVmEgjqrR7FN/s0TTdAK2VNkvMd5AFFbHmzvaGfZHJ1VnjhlKkrbdTW95E/JYIOum+O4/XufeKWoDRrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753309700; c=relaxed/simple; bh=sgooeZjbfM6S1ri+FrVmewlkP2UIgcflyZIdd6FVHsw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IO7JoNplMj3zdLWsi52W08a7yVId3rV1m3EQgjbFse0cTXHNN6o5ndEINfxFMpUblSyxm5w6qDfCHdeZw9KnG/HudFlhRj1ga6fQ40/Bn9OfthwiqWAmLPt4KozFTd/epgaq7V7JgoLaO7lfDpYUPKZg9y9dktPMICC9If1cBaw= 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=AOdiCa7j; 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="AOdiCa7j" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56NHDrtv025461 for ; Wed, 23 Jul 2025 22:28:17 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=16arupX2e1S BlChhr2W+V8p/tQWklYBcFD4Hu6qlLGg=; b=AOdiCa7jKX/D/Vwga3ZFEf1m3Yu 70HDTKS4vX9bXS197MiWBc3hLps02Zy2vNuwOL3m5uS0Sm+iGA3/72KrYX32wZCF JI5OMTofh8Mu5J1Bb9BN+NCRTUj9QkwVHcLJR/7DeNHfg2j64bKATCv0OZMDYgqP ZEKm8BXxZOW+fAFc4Tn5PbPZoG8Ye/PEo7DgRV7u2fHLrEIwSD60gX5d3yrQmzQX ipfu4MZv0Ia9cKuBOQ35Ok3AkdQvG+eJp/BoId7FqC9+eZyU9JwzldrmIxi9MQzU M66kQwrJhRrn/8yydyMLOtMbkAzbeaLj0bMV72iu6SF7XdTApiGG9D4IU4A== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 481g3esgx4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Jul 2025 22:28:17 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6fb3bb94b5cso5265516d6.2 for ; Wed, 23 Jul 2025 15:28:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753309696; x=1753914496; 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=16arupX2e1SBlChhr2W+V8p/tQWklYBcFD4Hu6qlLGg=; b=agLt7CopKV4W18G0/7xZ8W9s5NZ/ahnhUcmu5E3Wvz+p27hfpyNIN7vvqzNOjtX67m 7lmGgL5TeLzvQZZOw43JgLVJidNXZd5IRLTrhoiU8kiL0sR+jeIJmFzKhHVNkjU4DOSr jrUfmnTl87fYEQ06O2VA5sOIdzaT2jSxV+Jh1ceghHeBl9L+vh8l4M8NrHqo8IS8+K0h N2I2fwZq0Yx/nIgv0SUTMRhXMuB/FsRBkTM76/C3J+occh9L6PBxt3mSgDd2NxrQ4c6b xim9uy45bPuJkjNAEaHRRCpHim/h5gJW2DQFYyiwHdh8ee8XfQ8vMQpJ8PDb/GU4hkRE 6R6w== X-Forwarded-Encrypted: i=1; AJvYcCW5Me1ZHQYwX05On+iPRlMpC0S2V9SF7a0Gmfw6H63bQWkwBbtR+PaDraELCyEvAoTczRrnoR+++GzSzI4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6nBKknfMCilEfgjZG8AFZQ4AfhIl7fPfqMBSQfsALZToHf/Tx 6mLm1bXYdfHGY3C0q1b+QdHXLQ608bHwkrZaIWL1eVRDruYOwkgawVM4vYrEXhwjLaRGWuCuNlf ggeaFuTfuhACkmUjNlx9cStXk5KquqETFthIKZmm1GyMjvpj+AFmZPuM2bQ4eRNV5RO0= X-Gm-Gg: ASbGncsxU71HXgvca0uXo/B5U6V2cfxmiUUUC0uJS9+RT1xxthqyDDjPqbwvYP7y6eq ZS///ly0CmOaV9jRzyVIKTqkjD9pNST6ryLvzIc46bZdzV7ybtWGPVuwe69pBbtDdSp0dR7ifRD 9iF2vc18qakHByxJxru74uhTFFZIgvZGoUwJ6zMGmwfzbdL4Dg7yBCMzjDuzrMAYi0I42mxFnMm c9uCE/qZew0I+CP+cBlHVDzQTfx6I4ajVGZCB/ALOhx1UhDOKnR8nim2IDpaFvbyIXt3HxoKHWD us7GOEvuCOQhcNVIImAjMQo1kzwKINP0CohraNZoZarvce5eZWWI4g== X-Received: by 2002:a05:6214:3015:b0:704:7df7:c1a0 with SMTP id 6a1803df08f44-707004b362amr67677766d6.7.1753309695726; Wed, 23 Jul 2025 15:28:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENnDd7E8dvz4OBj48g90QpOOMdiTVyaWS/Zz6TAtRGOSxYgAkQu5KM2rpchgfGqo30V4noHw== X-Received: by 2002:a05:6214:3015:b0:704:7df7:c1a0 with SMTP id 6a1803df08f44-707004b362amr67677536d6.7.1753309695310; Wed, 23 Jul 2025 15:28:15 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b76fcad23bsm248520f8f.44.2025.07.23.15.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 15:28:14 -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 23/23] arm64: dts: qcom: sm8650: add sound prefix for wsa2 Date: Wed, 23 Jul 2025 23:27:37 +0100 Message-ID: <20250723222737.35561-24-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-ORIG-GUID: B5J8v7Bx7Jh3t-JUs-BpRWdZqAs6GWj5 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIzMDE5MyBTYWx0ZWRfXyTLI94BVaKMO iuoOBGPqxKEs+V+MH4r56M71C8BZKqVjX7CNeXjYCvNP9M8xiUJry5pTDf5qc2taeokNP5+lOpY WZ6ztwDssU2Xc8lK+MYquAcn9wEfU8+P7PTwfGNmK0uqn3sMJ7H1hyEk7MCSGziBBzNE7z+ZC6w LqHkS+vVRxB2aDXLK6V50EXj7B5i1dTptd1Wzbb/h87kZ4bSK/qe5W5CfPOcq2wDAglTyZV9WHT 8PPYcOrWXcNTy/OA7Y/ieYia5cJsTxIMjM7AgP9w/02mA6p5CWCJQ2UqoIXXoMy4mgS0Ce0ORJ2 htnhtbDRjtbmM42NTLzjkQ6NJZi2QgCfpMX3MledowC/z1Dt8gGqyGfxDPM2ekvAG2QWM0NQrsN YBQGtokslI4k0OGLxw9yOAXQrWRYskEdQv/g58LTLajMkx1jTANNQdaJcflYuUkOLA3hqMcm X-Authority-Analysis: v=2.4 cv=Q+fS452a c=1 sm=1 tr=0 ts=68816201 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=Nfxnn_ge1f9Pje3RmyYA:9 a=zZCYzV9kfG8A:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-GUID: B5J8v7Bx7Jh3t-JUs-BpRWdZqAs6GWj5 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 clxscore=1015 adultscore=0 phishscore=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=797 suspectscore=0 spamscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 impostorscore=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 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 Reviewed-by: Neil Armstrong --- 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/qco= m/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 =3D <0>; clock-output-names =3D "wsa2-mclk"; #sound-dai-cells =3D <1>; + sound-name-prefix =3D "WSA2"; }; =20 swr3: soundwire@6ab0000 { --=20 2.50.0