Commit fdc6a0b2 authored by Johan Hovold's avatar Johan Hovold Committed by Bjorn Andersson

arm64: dts: qcom: sc8280xp-x13s: move wcd938x codec node

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'.
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230103103141.15807-5-johan+linaro@kernel.org
parent acf90614
...@@ -21,6 +21,32 @@ / { ...@@ -21,6 +21,32 @@ / {
model = "Lenovo ThinkPad X13s"; model = "Lenovo ThinkPad X13s";
compatible = "lenovo,thinkpad-x13s", "qcom,sc8280xp"; 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>;
};
backlight: backlight { backlight: backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pwms = <&pmc8280c_lpg 3 1000000>; pwms = <&pmc8280c_lpg 3 1000000>;
...@@ -696,30 +722,6 @@ &rxmacro { ...@@ -696,30 +722,6 @@ &rxmacro {
status = "okay"; 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>;
};
};
&sound { &sound {
compatible = "qcom,sc8280xp-sndcard"; compatible = "qcom,sc8280xp-sndcard";
model = "SC8280XP-LENOVO-X13S"; model = "SC8280XP-LENOVO-X13S";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment