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.
>
> While at it, clean up the node somewhat by adding newline separators,
> reordering properties and renaming it 'audio-codec'.
>
> Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 54 ++++++++++---------
> 1 file changed, 28 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index 97ff74d5095e..ae67c11bfc22 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -21,6 +21,34 @@ / {
> model = "Lenovo ThinkPad X13s";
> compatible = "lenovo,thinkpad-x13s", "qcom,sc8280xp";
>
> + wcd938x: audio-codec {
> + compatible = "qcom,wcd9380-codec";
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&wcd_default>;
> +
> + reset-gpios = <&tlmm 106 GPIO_ACTIVE_LOW>;
> +
> + vdd-buck-supply = <&vreg_s10b>;
> + vdd-rxtx-supply = <&vreg_s10b>;
> + vdd-io-supply = <&vreg_s10b>;
> + 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-dai-cells = <1>;
> +
> + status = "disabled";
> + };
> +
> backlight {
> compatible = "pwm-backlight";
> pwms = <&pmc8280c_lpg 3 1000000>;
> @@ -628,32 +656,6 @@ &remoteproc_nsp0 {
> status = "okay";
> };
>
> -&soc {
> - wcd938x: codec {
> - compatible = "qcom,wcd9380-codec";
> - pinctrl-names = "default";
> - pinctrl-0 = <&wcd_default>;
> - reset-gpios = <&tlmm 106 GPIO_ACTIVE_LOW>;
> - #sound-dai-cells = <1>;
> -
> - vdd-buck-supply = <&vreg_s10b>;
> - vdd-rxtx-supply = <&vreg_s10b>;
> - vdd-io-supply = <&vreg_s10b>;
> - 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>;
> -
> - status = "disabled";
> - };
> -};
> -
> &sound {
> compatible = "qcom,sc8280xp-sndcard";
> model = "SC8280XP-LENOVO-X13S";
