| Message ID | 20230102105038.8074-6-johan+linaro@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4106658wrt;
Mon, 2 Jan 2023 02:52:52 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXsvGV6OM/0kWYRR0NbBdS9Lxh9cpVZvDgBKS1xXe8Q33Tk4i8PcsI8HExCmNvjehTdHQo80
X-Received: by 2002:aa7:ccc2:0:b0:477:8ab8:43e0 with SMTP id
y2-20020aa7ccc2000000b004778ab843e0mr34235479edt.2.1672656772000;
Mon, 02 Jan 2023 02:52:52 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1672656771; cv=none;
d=google.com; s=arc-20160816;
b=RTyTGPG9o2rzr9WGEGdg3N2A66PbV1+O0PJeKedpZnGXZPX+kIzMp319F4v1qL4Cag
NxwTArXROnYM5JNRxctJf+lJvVJuxk6Ydtbz0uTwPMcJV3FyNv0bm6JEnfi2DTdNH3bq
OEe5u+qFJRrUNwnJ1GlsWQTdbR17P2Wq7nbF3FT8Jr25Wb4fqrmlaztkDBTj/aWE7sw2
AbPq6xFQg/kVSvTT0JqylvcYE5K7lRHSwTazp02cT3Fj+yg3KJ/4B5iKNB8Fz/yTnKNe
qAa+cmNIlqnIJvCK7WjqcYw4VuX32jos/TGgJxxGaWxQGftXYn2BmogXuKaXloNCTUoA
oTNg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from
:dkim-signature;
bh=Aj4mi5KIExSlFkgkIT3i6fwMgZc++WpFlO4t8X0qooU=;
b=fps+cIOqS+xAKcozl9sIs/+HIgwfBya6wvEOJcptYO5bUy+k6amtSH5ZAJnilvMi4v
xzYuamUQu6oTa3qFtwABtW/zz0Me6BDiwo9094soVU3HP0b494/Q65dHxwBZ4mn2XcAJ
Tih93hEQsWwL3Wyxl9RZ/tkSFLuz+lrUgXSp3xm/T84R0w+1cPlbUhfcB+xTSJ9UHexo
MyYGqxHE8r8n89OeWKz6BuDpLF0rV0ioS7RLuP+LnHfG44BvYdQD9nt3S4BC3JfGpnGX
nJQWJTRHU1O+BZKaCUKxmLMhTObS3bAmDPehEI8RoxUhKvkgR0Sn6x++ygR0qQMkJYpd
ZDng==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jbNETFuc;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
r14-20020a05640251ce00b0047cf2d292b8si26082116edd.559.2023.01.02.02.52.28;
Mon, 02 Jan 2023 02:52:51 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jbNETFuc;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232439AbjABKvn (ORCPT <rfc822;wlfightup@gmail.com> + 99 others);
Mon, 2 Jan 2023 05:51:43 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52436 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232643AbjABKvN (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 2 Jan 2023 05:51:13 -0500
Received: from dfw.source.kernel.org (dfw.source.kernel.org
[IPv6:2604:1380:4641:c500::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E05062F2;
Mon, 2 Jan 2023 02:50:53 -0800 (PST)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by dfw.source.kernel.org (Postfix) with ESMTPS id 95C3860F2F;
Mon, 2 Jan 2023 10:50:52 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82E3AC43442;
Mon, 2 Jan 2023 10:50:51 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1672656651;
bh=lCnlWTz7E2JT4DsGGsbUN7wr3y738SvPqozHAINwpoA=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=jbNETFuc5HXKLMyoVazu/4FhPND8PQ9dLi8Qd4l/Sxjay0tr960z9OkubYQ1968IL
YkXh/3tNYJlakdMuyWk7lJvrFBmMoC6jhZdTWIzHGRyjtLqrhregv1Y82c82ORGebN
I1Tfq37XX1B6zG/cPNwjdbtr2Hv8dsoQ5BmyQqcvSIFx/w4pknBTb28pwD39hCSMfW
TP/5uUVAVsPkxdbgLL3MUGUMYLE7+rSiePbuV56dwKEKFOLgyg68SPtbiOPVppkWGA
i44g3lC6mXepHtRBT+1dBJHzSeMjs+tRAKwwq4aeKUjpERRtPwwzo2Iyrj4wqwgaho
typQjxsCXKibw==
Received: from johan by xi.lan with local (Exim 4.94.2)
(envelope-from <johan+linaro@kernel.org>)
id 1pCIPM-000270-H5; Mon, 02 Jan 2023 11:51:08 +0100
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
Message-Id: <20230102105038.8074-6-johan+linaro@kernel.org>
X-Mailer: git-send-email 2.37.4
In-Reply-To: <20230102105038.8074-1-johan+linaro@kernel.org>
References: <20230102105038.8074-1-johan+linaro@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,
SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1753907746960692550?=
X-GMAIL-MSGID: =?utf-8?q?1753907746960692550?=
|
| Series |
arm64: dts: qcom: disable x13s sound + cleanups
|
|
Commit Message
Johan Hovold
Jan. 2, 2023, 10:50 a.m. UTC
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(-)
Comments
On 2.01.2023 11:50, Johan Hovold wrote: > 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> > --- Could you rename it to audio-codec and separate/sort the properties like you did for x13s? Konrad > 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";
On Mon, Jan 02, 2023 at 12:15:50PM +0100, Konrad Dybcio wrote: > > > On 2.01.2023 11:50, Johan Hovold wrote: > > 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> > > --- > Could you rename it to audio-codec and separate/sort the properties > like you did for x13s? Possibly, but unlike for sc8280xp, I don't really care about these platforms and how their DT authors have chosen to order properties so I left out the clean up bits on purpose. Johan
On 02/01/2023 11:50, Johan Hovold wrote: > 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(-) Don't you base on some older tree? It was alreadt moved. Maybe other changes were also implemented... Best regards, Krzysztof
On Mon, Jan 02, 2023 at 01:20:03PM +0100, Krzysztof Kozlowski wrote: > On 02/01/2023 11:50, Johan Hovold wrote: > > 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(-) > > Don't you base on some older tree? It was alreadt moved. Maybe other > changes were also implemented... If you've moved this node is hasn't made it into linux-next (or the qcom tree) yet. Johan
On 02/01/2023 16:03, Johan Hovold wrote: > On Mon, Jan 02, 2023 at 01:20:03PM +0100, Krzysztof Kozlowski wrote: >> On 02/01/2023 11:50, Johan Hovold wrote: >>> 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(-) >> >> Don't you base on some older tree? It was alreadt moved. Maybe other >> changes were also implemented... > > If you've moved this node is hasn't made it into linux-next (or the qcom > tree) yet. So you need to update your tree/rebase as this is already in Qualcomm tree. There was no linux-next release since a week, so that's not a solution. Best regards, Krzysztof
On Mon, Jan 02, 2023 at 04:09:14PM +0100, Krzysztof Kozlowski wrote: > On 02/01/2023 16:03, Johan Hovold wrote: > > On Mon, Jan 02, 2023 at 01:20:03PM +0100, Krzysztof Kozlowski wrote: > >> On 02/01/2023 11:50, Johan Hovold wrote: > >>> 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(-) > >> > >> Don't you base on some older tree? It was alreadt moved. Maybe other > >> changes were also implemented... > > > > If you've moved this node is hasn't made it into linux-next (or the qcom > > tree) yet. > > So you need to update your tree/rebase as this is already in Qualcomm > tree. There was no linux-next release since a week, so that's not a > solution. As I wrote above, it's not in the qcom tree either. Johan
On 02/01/2023 16:18, Johan Hovold wrote: > On Mon, Jan 02, 2023 at 04:09:14PM +0100, Krzysztof Kozlowski wrote: >> On 02/01/2023 16:03, Johan Hovold wrote: >>> On Mon, Jan 02, 2023 at 01:20:03PM +0100, Krzysztof Kozlowski wrote: >>>> On 02/01/2023 11:50, Johan Hovold wrote: >>>>> 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(-) >>>> >>>> Don't you base on some older tree? It was alreadt moved. Maybe other >>>> changes were also implemented... >>> >>> If you've moved this node is hasn't made it into linux-next (or the qcom >>> tree) yet. >> >> So you need to update your tree/rebase as this is already in Qualcomm >> tree. There was no linux-next release since a week, so that's not a >> solution. > > As I wrote above, it's not in the qcom tree either. Really? https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git/commit/?h=for-next&id=e5b8c08245307a82cdf180cd5d385a34ba1cfd9d Best regards, Krzysztof
On Mon, Jan 02, 2023 at 04:22:30PM +0100, Krzysztof Kozlowski wrote: > On 02/01/2023 16:18, Johan Hovold wrote: > > On Mon, Jan 02, 2023 at 04:09:14PM +0100, Krzysztof Kozlowski wrote: > >> On 02/01/2023 16:03, Johan Hovold wrote: > >>> On Mon, Jan 02, 2023 at 01:20:03PM +0100, Krzysztof Kozlowski wrote: > >>>> On 02/01/2023 11:50, Johan Hovold wrote: > >>>>> 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(-) > >>>> > >>>> Don't you base on some older tree? It was alreadt moved. Maybe other > >>>> changes were also implemented... > >>> > >>> If you've moved this node is hasn't made it into linux-next (or the qcom > >>> tree) yet. > >> > >> So you need to update your tree/rebase as this is already in Qualcomm > >> tree. There was no linux-next release since a week, so that's not a > >> solution. > > > > As I wrote above, it's not in the qcom tree either. > > Really? > > https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git/commit/?h=for-next&id=e5b8c08245307a82cdf180cd5d385a34ba1cfd9d Sorry, most have looked at on old branch or something. Johan
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";