| Message ID | 20230102105038.8074-7-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: disable x13s sound + cleanups | expand |
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";
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(-)