public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Johan Hovold <johan+linaro@kernel.org>
To: Bjorn Andersson <andersson@kernel.org>
Cc: Andy Gross <agross@kernel.org>,
	Konrad Dybcio <konrad.dybcio@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
	linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 5/6] arm64: dts: qcom: sm8250-mtp: fix wcd938x codec node
Date: Mon,  2 Jan 2023 11:50:37 +0100	[thread overview]
Message-ID: <20230102105038.8074-6-johan+linaro@kernel.org> (raw)
In-Reply-To: <20230102105038.8074-1-johan+linaro@kernel.org>

The wcd938x codec is not a memory-mapped device and does not belong
under the soc node.

Move the node to the root node to avoid DT validation failures.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 40 ++++++++++++-------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 3ed8c84e25b8..ea43dbdc3671 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -23,6 +23,25 @@ aliases {
 		serial0 = &uart12;
 	};
 
+	wcd938x: codec {
+		compatible = "qcom,wcd9380-codec";
+		#sound-dai-cells = <1>;
+		reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
+		vdd-buck-supply = <&vreg_s4a_1p8>;
+		vdd-rxtx-supply = <&vreg_s4a_1p8>;
+		vdd-io-supply = <&vreg_s4a_1p8>;
+		vdd-mic-bias-supply = <&vreg_bob>;
+		qcom,micbias1-microvolt = <1800000>;
+		qcom,micbias2-microvolt = <1800000>;
+		qcom,micbias3-microvolt = <1800000>;
+		qcom,micbias4-microvolt = <1800000>;
+		qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>;
+		qcom,mbhc-headset-vthreshold-microvolt = <1700000>;
+		qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
+		qcom,rx-device = <&wcd_rx>;
+		qcom,tx-device = <&wcd_tx>;
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
@@ -631,27 +650,6 @@ &slpi {
 	firmware-name = "qcom/sm8250/slpi.mbn";
 };
 
-&soc {
-	wcd938x: codec {
-		compatible = "qcom,wcd9380-codec";
-		#sound-dai-cells = <1>;
-		reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
-		vdd-buck-supply = <&vreg_s4a_1p8>;
-		vdd-rxtx-supply = <&vreg_s4a_1p8>;
-		vdd-io-supply = <&vreg_s4a_1p8>;
-		vdd-mic-bias-supply = <&vreg_bob>;
-		qcom,micbias1-microvolt = <1800000>;
-		qcom,micbias2-microvolt = <1800000>;
-		qcom,micbias3-microvolt = <1800000>;
-		qcom,micbias4-microvolt = <1800000>;
-		qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>;
-		qcom,mbhc-headset-vthreshold-microvolt = <1700000>;
-		qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
-		qcom,rx-device = <&wcd_rx>;
-		qcom,tx-device = <&wcd_tx>;
-	};
-};
-
 &sound {
 	compatible = "qcom,sm8250-sndcard";
 	model = "SM8250-MTP-WCD9380-WSA8810-VA-DMIC";
-- 
2.37.4


  parent reply	other threads:[~2023-01-02 10:51 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-02 10:50 [PATCH 0/6] arm64: dts: qcom: disable x13s sound + cleanups Johan Hovold
2023-01-02 10:50 ` [PATCH 1/6] arm64: dts: qcom: sc8280xp-x13s: disable soundcard Johan Hovold
2023-01-02 12:25   ` Krzysztof Kozlowski
2023-01-02 15:07     ` Johan Hovold
2023-01-02 15:12       ` Krzysztof Kozlowski
2023-01-02 15:24         ` Johan Hovold
2023-01-02 15:28           ` Krzysztof Kozlowski
2023-01-02 15:39             ` Johan Hovold
2023-01-02 15:46               ` Krzysztof Kozlowski
2023-01-02 15:58                 ` Johan Hovold
2023-01-02 16:13                   ` Krzysztof Kozlowski
2023-01-02 16:52                     ` Johan Hovold
2023-01-02 10:50 ` [PATCH 2/6] arm64: dts: qcom: sc8280xp: disable sound nodes Johan Hovold
2023-01-02 11:13   ` Konrad Dybcio
2023-01-02 12:29   ` Krzysztof Kozlowski
2023-01-02 15:15     ` Johan Hovold
2023-01-02 17:17       ` Johan Hovold
2023-01-02 17:20         ` Konrad Dybcio
2023-01-02 10:50 ` [PATCH 3/6] arm64: dts: qcom: sc8280xp: clean up tx-macro node Johan Hovold
2023-01-02 11:13   ` Konrad Dybcio
2023-01-02 10:50 ` [PATCH 4/6] arm64: dts: qcom: sc8280xp-x13s: fix wcd938x codec node Johan Hovold
2023-01-02 11:14   ` Konrad Dybcio
2023-01-02 10:50 ` Johan Hovold [this message]
2023-01-02 11:15   ` [PATCH 5/6] arm64: dts: qcom: sm8250-mtp: " Konrad Dybcio
2023-01-02 11:22     ` Johan Hovold
2023-01-02 12:20   ` Krzysztof Kozlowski
2023-01-02 15:03     ` Johan Hovold
2023-01-02 15:09       ` Krzysztof Kozlowski
2023-01-02 15:18         ` Johan Hovold
2023-01-02 15:22           ` Krzysztof Kozlowski
2023-01-02 15:28             ` Johan Hovold
2023-01-02 10:50 ` [PATCH 6/6] arm64: dts: qcom: sm8450-hdk: " Johan Hovold
2023-01-02 11:16   ` Konrad Dybcio
2023-01-02 11:42     ` Johan Hovold
2023-01-02 12:23   ` Krzysztof Kozlowski
2023-01-02 12:24     ` Krzysztof Kozlowski
2023-01-02 15:05       ` Johan Hovold
2023-01-02 15:09         ` Krzysztof Kozlowski
2023-01-02 15:18           ` Johan Hovold
2023-01-02 15:24             ` 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=20230102105038.8074-6-johan+linaro@kernel.org \
    --to=johan+linaro@kernel.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=devicetree@vger.kernel.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=robh+dt@kernel.org \
    --cc=srinivas.kandagatla@linaro.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox