From: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
To: <agross@kernel.org>, <andersson@kernel.org>, <robh+dt@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>,
<linux-arm-msm@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <quic_rohkumar@quicinc.com>,
<srinivas.kandagatla@linaro.org>, <dianders@chromium.org>,
<swboyd@chromium.org>, <judyhsiao@chromium.org>,
<konrad.dybcio@linaro.org>
Cc: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Subject: [PATCH 2/7] arm64: dts: qcom: sc7280: audioreach: Add sound node
Date: Thu, 22 Dec 2022 15:12:45 +0530 [thread overview]
Message-ID: <1671702170-24781-3-git-send-email-quic_srivasam@quicinc.com> (raw)
In-Reply-To: <1671702170-24781-1-git-send-email-quic_srivasam@quicinc.com>
Add sound node for sc7280 based audioreach platforms.
Include audioreach dtsi into crd-rev3 platform specific dts file.
Also remove phandle to sound node, as audio routing is same as
audioreach specific dtsi file.
Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Tested-by: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
---
arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 25 +----
.../qcom/sc7280-herobrine-audioreach-wcd9385.dtsi | 112 +++++++++++++++++++++
2 files changed, 113 insertions(+), 24 deletions(-)
create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audioreach-wcd9385.dtsi
diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
index b024626..aea8cbd 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
@@ -8,7 +8,7 @@
/dts-v1/;
#include "sc7280-idp.dtsi"
-#include "sc7280-audio-idp.dtsi"
+#include "sc7280-herobrine-audioreach-wcd9385.dtsi"
#include "sc7280-idp-ec-h1.dtsi"
/ {
@@ -88,29 +88,6 @@ ap_ts_pen_1v8: &i2c13 {
pins = "gpio51";
};
-&sound {
- audio-routing =
- "IN1_HPHL", "HPHL_OUT",
- "IN2_HPHR", "HPHR_OUT",
- "AMIC1", "MIC BIAS1",
- "AMIC2", "MIC BIAS2",
- "VA DMIC0", "MIC BIAS1",
- "VA DMIC1", "MIC BIAS1",
- "VA DMIC2", "MIC BIAS3",
- "VA DMIC3", "MIC BIAS3",
- "TX SWR_ADC0", "ADC1_OUTPUT",
- "TX SWR_ADC1", "ADC2_OUTPUT",
- "TX SWR_ADC2", "ADC3_OUTPUT",
- "TX SWR_DMIC0", "DMIC1_OUTPUT",
- "TX SWR_DMIC1", "DMIC2_OUTPUT",
- "TX SWR_DMIC2", "DMIC3_OUTPUT",
- "TX SWR_DMIC3", "DMIC4_OUTPUT",
- "TX SWR_DMIC4", "DMIC5_OUTPUT",
- "TX SWR_DMIC5", "DMIC6_OUTPUT",
- "TX SWR_DMIC6", "DMIC7_OUTPUT",
- "TX SWR_DMIC7", "DMIC8_OUTPUT";
-};
-
&wcd9385 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&wcd_reset_n>, <&us_euro_hs_sel>;
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audioreach-wcd9385.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audioreach-wcd9385.dtsi
new file mode 100644
index 0000000..1eac94e1
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audioreach-wcd9385.dtsi
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * sc7280 device tree source for boards using Max98360 and wcd9385 codec
+ * along with ADSP
+ *
+ * Copyright (c) 2022, The Linux Foundation. All rights reserved.
+ */
+
+#include <dt-bindings/sound/qcom,q6afe.h>
+#include <dt-bindings/soc/qcom,gpr.h>
+#include <dt-bindings/clock/qcom,lpass-sc7280.h>
+
+/{
+ /* BOARD-SPECIFIC TOP LEVEL NODES */
+ sound: sound {
+ compatible = "google,sc7280-herobrine";
+ model = "SC7280-AUDIOREACH";
+ status = "okay";
+ adsp-mode;
+ audio-routing =
+ "IN1_HPHL", "HPHL_OUT",
+ "IN2_HPHR", "HPHR_OUT",
+ "AMIC1", "MIC BIAS1",
+ "AMIC2", "MIC BIAS2",
+ "VA DMIC0", "MIC BIAS1",
+ "VA DMIC1", "MIC BIAS1",
+ "VA DMIC2", "MIC BIAS3",
+ "VA DMIC3", "MIC BIAS3",
+ "TX SWR_ADC0", "ADC1_OUTPUT",
+ "TX SWR_ADC1", "ADC2_OUTPUT",
+ "TX SWR_ADC2", "ADC3_OUTPUT",
+ "TX SWR_DMIC0", "DMIC1_OUTPUT",
+ "TX SWR_DMIC1", "DMIC2_OUTPUT",
+ "TX SWR_DMIC2", "DMIC3_OUTPUT",
+ "TX SWR_DMIC3", "DMIC4_OUTPUT",
+ "TX SWR_DMIC4", "DMIC5_OUTPUT",
+ "TX SWR_DMIC5", "DMIC6_OUTPUT",
+ "TX SWR_DMIC6", "DMIC7_OUTPUT",
+ "TX SWR_DMIC7", "DMIC8_OUTPUT";
+
+ qcom,msm-mbhc-hphl-swh = <1>;
+ qcom,msm-mbhc-gnd-swh = <1>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+ #sound-dai-cells = <0>;
+
+ dai-link@0 {
+ link-name = "WCD9385 Playback";
+ reg = <0>;
+
+ cpu {
+ sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>;
+ };
+ codec {
+ sound-dai = <&wcd9385 0>, <&swr0 0>, <&lpass_rx_macro 0>;
+ };
+ platform {
+ sound-dai = <&q6apm>;
+ };
+ };
+
+ dai-link@1 {
+ link-name = "WCD9385 Capture";
+ reg = <1>;
+
+ cpu {
+ sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>;
+ };
+ codec {
+ sound-dai = <&wcd9385 1>, <&swr1 0>, <&lpass_tx_macro 0>;
+ };
+ platform {
+ sound-dai = <&q6apm>;
+ };
+ };
+
+ dai-link@2 {
+ link-name = "MAX98360A";
+ reg = <3>;
+
+ cpu {
+ sound-dai = <&q6apmbedai SECONDARY_MI2S_RX>;
+ };
+
+ codec {
+ sound-dai = <&max98360a>;
+ };
+
+ platform {
+ sound-dai = <&q6apm>;
+ };
+ };
+
+ dai-link@3 {
+ link-name = "DMIC";
+ reg = <4>;
+
+ cpu {
+ sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>;
+ };
+
+ codec {
+ sound-dai = <&lpass_va_macro 0>;
+ };
+
+ platform {
+ sound-dai = <&q6apm>;
+ };
+ };
+ };
+};
--
2.7.4
next prev parent reply other threads:[~2022-12-22 9:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-22 9:42 [PATCH 0/7] Add SC7280 audioreach device tree nodes Srinivasa Rao Mandadapu
2022-12-22 9:42 ` [PATCH 1/7] arm64: dts: qcom: sc7280: Extract audio nodes from common idp dtsi file Srinivasa Rao Mandadapu
2022-12-23 9:05 ` Krzysztof Kozlowski
2022-12-22 9:42 ` Srinivasa Rao Mandadapu [this message]
2022-12-23 8:36 ` [PATCH 2/7] arm64: dts: qcom: sc7280: audioreach: Add sound node kernel test robot
2022-12-23 9:08 ` Krzysztof Kozlowski
2022-12-22 9:42 ` [PATCH 3/7] arm64: dts: qcom: sc7280: audioreach: Add lpass pil node Srinivasa Rao Mandadapu
2022-12-23 9:12 ` Krzysztof Kozlowski
2022-12-22 9:42 ` [PATCH 4/7] arm64: dts: qcom: sc7280: audioreach: Update lpasscc reg property Srinivasa Rao Mandadapu
2022-12-23 9:13 ` Krzysztof Kozlowski
2022-12-22 9:42 ` [PATCH 5/7] arm64: dts: qcom: sc7280: audioreach: Add CGCR reset property Srinivasa Rao Mandadapu
2022-12-23 9:14 ` Krzysztof Kozlowski
2022-12-22 9:42 ` [PATCH 6/7] arm64: dts: qcom: sc7280: audioreach: Update VA/RX/TX macro clock nodes Srinivasa Rao Mandadapu
2022-12-23 9:16 ` Krzysztof Kozlowski
2022-12-22 9:42 ` [PATCH 7/7] arm64: dts: qcom: sc7280: audioreach: Disable legacy path " Srinivasa Rao Mandadapu
2022-12-23 9:16 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1671702170-24781-3-git-send-email-quic_srivasam@quicinc.com \
--to=quic_srivasam@quicinc.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=judyhsiao@chromium.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quic_rohkumar@quicinc.com \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=swboyd@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.