| Message ID | 20230102105038.8074-6-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> > --- 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";
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(-)