| Message ID | 20230102105038.8074-7-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 p1csp4106655wrt;
Mon, 2 Jan 2023 02:52:51 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXtP2ANzPmR+z1Qrb+PgkMF0KBxqhQjk8nB0a0AZNJhL3kVOa1dl/HbzwV1WxPIwZysJSUjU
X-Received: by 2002:a62:b401:0:b0:580:9e9e:c442 with SMTP id
h1-20020a62b401000000b005809e9ec442mr35951512pfn.24.1672656771638;
Mon, 02 Jan 2023 02:52:51 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1672656771; cv=none;
d=google.com; s=arc-20160816;
b=vZZjiROXSv4l1z+rbAhXvOELijTfAtkempv7Ltxfuqwpq96worCYsiRUP23YFdOCZ4
PJepowrrsjiaIda/o94OsaX1Puz6d263+3xOn6Pgj4gRzAYmsI+yJzb68OjOfBf8d74p
+PG0hdGEZnkY4hBPZbHDqJfedOLyUAtPQDyr7Mqm75E+pruCvKyw8k/Ni2QLKI1pY9tE
oYH1YDgEwg2nS213I0n1DBQtuvFL1C6uuY0HVPG3M/NCD23/eLyC8jI62U5uBllHaKta
KVayKSIoHHVjD54WOMtUgIuyeLtFHjcoGST0FRDB6/fa5MEgEo+bvfA7SyqHX3hOdQuC
0jow==
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=riFowittTsHwSWgNwjmwKzxl4RBwjzKx1Nzks7zO9ug=;
b=uirF5X2EdODiKAn8Vm6iRJ26ZFeOYsgGB2GkkViu8EcnnmhnbnNu47O9hhcI/ioCAr
FiOegu7t2zIts1T3UpdZkIWyDJnnNmqZ1EdVbHtIDahVKIFu+XzXcYwBgX+eXv1lpWVa
NO+pTBV6NVYf81xjjqLEE+IOHwCpNlo+KYzKx6wULU7Whsime5xQU8WEHPDwpyRob8Ai
YSzSIU1MdHK2HrqOY1rYNEqWfb9mamob45i1v5zp/y0f3lxzh33IwlG44o7gznLQ2V9+
yxxdaGLtSGQDvjY0huZv4bSvEBbnpbTlEGIe7FioafLVBn1pmWrsO8xx6LSGYmxSeHFW
RCVg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R9XUZ6Dl;
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
u11-20020a056a00098b00b0056b8ae6149csi30283035pfg.244.2023.01.02.02.52.39;
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=R9XUZ6Dl;
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 S232647AbjABKvu (ORCPT <rfc822;wlfightup@gmail.com> + 99 others);
Mon, 2 Jan 2023 05:51:50 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52458 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232657AbjABKvO (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 2 Jan 2023 05:51:14 -0500
Received: from ams.source.kernel.org (ams.source.kernel.org
[IPv6:2604:1380:4601:e00::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5404962E2;
Mon, 2 Jan 2023 02:50:54 -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 ams.source.kernel.org (Postfix) with ESMTPS id D7047B80D07;
Mon, 2 Jan 2023 10:50:52 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82C12C433B3;
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=NnSjzogFraldpT+XgAkjYumPBRSVym0mp3juRqkdBpI=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=R9XUZ6DlHPc+bBa0ForStYZhT5tJwdXf/wFRBVQ5wdWU+fYlbl5yISWRi5rxUKSBD
M6jiVrGmjr3TIORGvzU+BHTsZLJdbWelF2azHeNme6dc0lY+SiV/6ner5FlG/VbY2L
tR40DLeW4viM5CNAn22sOvh85Kp1DHUxk60kQsLD0Wq7GAB+SArbcXJhV8WJnE9PfD
8RX1ee7JEDXEhC5GswkxemVwGaDvZAbLTZLe4HcBligs7MzVWyPX9dGI3oeTqBCzeo
nJCY7d+blk0TCw84twVzigMjo53JkEVAqDSP/lcxum4kUANFpeImylqiWmwnUfCC6Y
NXdcD8B2XUWzg==
Received: from johan by xi.lan with local (Exim 4.94.2)
(envelope-from <johan+linaro@kernel.org>)
id 1pCIPM-000273-Jl; 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 6/6] arm64: dts: qcom: sm8450-hdk: fix wcd938x codec node
Date: Mon, 2 Jan 2023 11:50:38 +0100
Message-Id: <20230102105038.8074-7-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?1753907747180181818?=
X-GMAIL-MSGID: =?utf-8?q?1753907747180181818?=
|
| 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/sm8450-hdk.dts | 52 ++++++++++++-------------
1 file changed, 25 insertions(+), 27 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> > --- Third patch concerning the audio codec and third different order of properties :/ Please consolidate that. Konrad > arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 52 ++++++++++++------------- > 1 file changed, 25 insertions(+), 27 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > index 4de3e1f1c39c..217b2c654745 100644 > --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > @@ -17,6 +17,31 @@ aliases { > serial0 = &uart7; > }; > > + wcd938x: codec { > + compatible = "qcom,wcd9380-codec"; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&wcd_default>; > + > + 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>; > + > + reset-gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; > + #sound-dai-cells = <1>; > + > + vdd-buck-supply = <&vreg_s10b_1p8>; > + vdd-rxtx-supply = <&vreg_s10b_1p8>; > + vdd-io-supply = <&vreg_s10b_1p8>; > + vdd-mic-bias-supply = <&vreg_bob>; > + }; > + > chosen { > stdout-path = "serial0:115200n8"; > }; > @@ -407,33 +432,6 @@ &sdhc_2 { > status = "okay"; > }; > > -&soc { > - wcd938x: codec { > - compatible = "qcom,wcd9380-codec"; > - > - pinctrl-names = "default"; > - pinctrl-0 = <&wcd_default>; > - > - 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>; > - > - reset-gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; > - #sound-dai-cells = <1>; > - > - vdd-buck-supply = <&vreg_s10b_1p8>; > - vdd-rxtx-supply = <&vreg_s10b_1p8>; > - vdd-io-supply = <&vreg_s10b_1p8>; > - vdd-mic-bias-supply = <&vreg_bob>; > - }; > -}; > - > &sound { > compatible = "qcom,sm8450-sndcard"; > model = "SM8450-HDK";
On Mon, Jan 02, 2023 at 12:16:44PM +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> > > --- > Third patch concerning the audio codec and third different > order of properties :/ Please consolidate that. It's arguably a separate change (even if I included it for the disabled x13s node). I'm fixing the fact that the node should not have been added under 'soc' in the first place. Reordering properties can be done as a follow up if anyone cares enough, even if I could possibly have renamed the node when moving it. 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/sm8450-hdk.dts | 52 ++++++++++++------------- > 1 file changed, 25 insertions(+), 27 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > index 4de3e1f1c39c..217b2c654745 100644 > --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > @@ -17,6 +17,31 @@ aliases { > serial0 = &uart7; > }; > > + wcd938x: codec { Let's call it audio-codec and put it somewhere ordered alphabetically. This avoids useless reshuffles immediately. Moving things back and forth does not make sense. Best regards, Krzysztof
On 02/01/2023 13:23, 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/sm8450-hdk.dts | 52 ++++++++++++------------- >> 1 file changed, 25 insertions(+), 27 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >> index 4de3e1f1c39c..217b2c654745 100644 >> --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >> +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >> @@ -17,6 +17,31 @@ aliases { >> serial0 = &uart7; >> }; >> >> + wcd938x: codec { > > Let's call it audio-codec and put it somewhere ordered alphabetically. > This avoids useless reshuffles immediately. Moving things back and forth > does not make sense. Eh, on the other hand SM8250-MTP uses name codec so maybe the rename in SC8280xp should be dropped. Best regards, Krzysztof
On Mon, Jan 02, 2023 at 01:24:34PM +0100, Krzysztof Kozlowski wrote: > On 02/01/2023 13:23, 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/sm8450-hdk.dts | 52 ++++++++++++------------- > >> 1 file changed, 25 insertions(+), 27 deletions(-) > >> > >> diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > >> index 4de3e1f1c39c..217b2c654745 100644 > >> --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > >> +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > >> @@ -17,6 +17,31 @@ aliases { > >> serial0 = &uart7; > >> }; > >> > >> + wcd938x: codec { > > > > Let's call it audio-codec and put it somewhere ordered alphabetically. > > This avoids useless reshuffles immediately. Moving things back and forth > > does not make sense. > > Eh, on the other hand SM8250-MTP uses name codec so maybe the rename in > SC8280xp should be dropped. Nah, let's go with audio-codec. Your MTP change hasn't been merged yet so we can still drop or respin that one. Johan
On 02/01/2023 16:05, Johan Hovold wrote: > On Mon, Jan 02, 2023 at 01:24:34PM +0100, Krzysztof Kozlowski wrote: >> On 02/01/2023 13:23, 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/sm8450-hdk.dts | 52 ++++++++++++------------- >>>> 1 file changed, 25 insertions(+), 27 deletions(-) >>>> >>>> diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >>>> index 4de3e1f1c39c..217b2c654745 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >>>> +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >>>> @@ -17,6 +17,31 @@ aliases { >>>> serial0 = &uart7; >>>> }; >>>> >>>> + wcd938x: codec { >>> >>> Let's call it audio-codec and put it somewhere ordered alphabetically. >>> This avoids useless reshuffles immediately. Moving things back and forth >>> does not make sense. >> >> Eh, on the other hand SM8250-MTP uses name codec so maybe the rename in >> SC8280xp should be dropped. > > Nah, let's go with audio-codec. Your MTP change hasn't been merged yet > so we can still drop or respin that one. It was, ~5 days ago, so please rebase. Best regards, Krzysztof
On Mon, Jan 02, 2023 at 04:09:59PM +0100, Krzysztof Kozlowski wrote: > On 02/01/2023 16:05, Johan Hovold wrote: > > On Mon, Jan 02, 2023 at 01:24:34PM +0100, Krzysztof Kozlowski wrote: > >> On 02/01/2023 13:23, 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/sm8450-hdk.dts | 52 ++++++++++++------------- > >>>> 1 file changed, 25 insertions(+), 27 deletions(-) > >>>> > >>>> diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > >>>> index 4de3e1f1c39c..217b2c654745 100644 > >>>> --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > >>>> +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > >>>> @@ -17,6 +17,31 @@ aliases { > >>>> serial0 = &uart7; > >>>> }; > >>>> > >>>> + wcd938x: codec { > >>> > >>> Let's call it audio-codec and put it somewhere ordered alphabetically. > >>> This avoids useless reshuffles immediately. Moving things back and forth > >>> does not make sense. > >> > >> Eh, on the other hand SM8250-MTP uses name codec so maybe the rename in > >> SC8280xp should be dropped. > > > > Nah, let's go with audio-codec. Your MTP change hasn't been merged yet > > so we can still drop or respin that one. > > It was, ~5 days ago, so please rebase. Again, not in the qcom tree yet AFAICS. Johan
On 02/01/2023 16:18, Johan Hovold wrote: > On Mon, Jan 02, 2023 at 04:09:59PM +0100, Krzysztof Kozlowski wrote: >> On 02/01/2023 16:05, Johan Hovold wrote: >>> On Mon, Jan 02, 2023 at 01:24:34PM +0100, Krzysztof Kozlowski wrote: >>>> On 02/01/2023 13:23, 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/sm8450-hdk.dts | 52 ++++++++++++------------- >>>>>> 1 file changed, 25 insertions(+), 27 deletions(-) >>>>>> >>>>>> diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >>>>>> index 4de3e1f1c39c..217b2c654745 100644 >>>>>> --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >>>>>> +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts >>>>>> @@ -17,6 +17,31 @@ aliases { >>>>>> serial0 = &uart7; >>>>>> }; >>>>>> >>>>>> + wcd938x: codec { >>>>> >>>>> Let's call it audio-codec and put it somewhere ordered alphabetically. >>>>> This avoids useless reshuffles immediately. Moving things back and forth >>>>> does not make sense. >>>> >>>> Eh, on the other hand SM8250-MTP uses name codec so maybe the rename in >>>> SC8280xp should be dropped. >>> >>> Nah, let's go with audio-codec. Your MTP change hasn't been merged yet >>> so we can still drop or respin that one. >> >> It was, ~5 days ago, so please rebase. > > Again, not in the qcom tree yet AFAICS. It's clearly visible there, since a week, so please update your trees and rebase. Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts index 4de3e1f1c39c..217b2c654745 100644 --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts @@ -17,6 +17,31 @@ aliases { serial0 = &uart7; }; + wcd938x: codec { + compatible = "qcom,wcd9380-codec"; + + pinctrl-names = "default"; + pinctrl-0 = <&wcd_default>; + + 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>; + + reset-gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <1>; + + vdd-buck-supply = <&vreg_s10b_1p8>; + vdd-rxtx-supply = <&vreg_s10b_1p8>; + vdd-io-supply = <&vreg_s10b_1p8>; + vdd-mic-bias-supply = <&vreg_bob>; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -407,33 +432,6 @@ &sdhc_2 { status = "okay"; }; -&soc { - wcd938x: codec { - compatible = "qcom,wcd9380-codec"; - - pinctrl-names = "default"; - pinctrl-0 = <&wcd_default>; - - 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>; - - reset-gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; - #sound-dai-cells = <1>; - - vdd-buck-supply = <&vreg_s10b_1p8>; - vdd-rxtx-supply = <&vreg_s10b_1p8>; - vdd-io-supply = <&vreg_s10b_1p8>; - vdd-mic-bias-supply = <&vreg_bob>; - }; -}; - &sound { compatible = "qcom,sm8450-sndcard"; model = "SM8450-HDK";