| Message ID | 20230103103141.15807-7-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 74d6ed033d47200d18204e3935b201f385476271 |
| Headers | show |
| Series | arm64: dts: qcom: sound cleanups | expand |
On 3.01.2023 11:31, Johan Hovold wrote: > Clean up the wcd938x codec node somewhat by adding newline separators, > reordering properties and renaming it 'audio-codec'. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts > index b741b7da1afc..0991b34a8e49 100644 > --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts > +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts > @@ -23,18 +23,16 @@ aliases { > serial0 = &uart12; > }; > > - chosen { > - stdout-path = "serial0:115200n8"; > - }; > - > - wcd938x: codec { > + wcd938x: audio-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>; > @@ -44,6 +42,12 @@ wcd938x: codec { > qcom,mbhc-headphone-vthreshold-microvolt = <50000>; > qcom,rx-device = <&wcd_rx>; > qcom,tx-device = <&wcd_tx>; > + > + #sound-dai-cells = <1>; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > }; > > thermal-zones {
diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts index b741b7da1afc..0991b34a8e49 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts @@ -23,18 +23,16 @@ aliases { serial0 = &uart12; }; - chosen { - stdout-path = "serial0:115200n8"; - }; - - wcd938x: codec { + wcd938x: audio-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>; @@ -44,6 +42,12 @@ wcd938x: codec { qcom,mbhc-headphone-vthreshold-microvolt = <50000>; qcom,rx-device = <&wcd_rx>; qcom,tx-device = <&wcd_tx>; + + #sound-dai-cells = <1>; + }; + + chosen { + stdout-path = "serial0:115200n8"; }; thermal-zones {
Clean up the wcd938x codec node somewhat by adding newline separators, reordering properties and renaming it 'audio-codec'. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)