arm64: dts: qcom: pm8916: Move default regulator "-supply"s

Some of the power supplies for the analog audio codec in PM8916 are
wired externally. While most boards use the regulators currently
specified in pm8916.dtsi, in theory it could be connected differently.

We already have msm8916-pm8916.dtsi that models that standard setup
used by most devices so move the -supply properties there and keep
the base pm8916.dtsi independent.

Currently all MSM8916 boards in mainline make use of
msm8916-pm8916.dtsi, so it is not necessary to adjust any other boards.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230510-msm8916-regulators-v1-5-54d4960a05fc@gerhold.net

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
index 6eb5e0a39510026b2321a1420a6cc45e9286a943..5b3ed7137e1f1fb2b80dd23bd78a8808edce828a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
@@ -35,6 +35,12 @@
        v3p3-supply = <&pm8916_l13>;
 };
 
+&wcd_codec {
+       vdd-cdc-io-supply = <&pm8916_l5>;
+       vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
+       vdd-micbias-supply = <&pm8916_l13>;
+};
+
 &wcnss {
        vddpx-supply = <&pm8916_l7>;
 };

diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 33ca1002fb754794e500a0b93226194c60b8360a..864bb1cd68dbfd9eab1e99cbd46be3fdfdaa9806 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -174,9 +174,6 @@
                                          "cdc_ear_cnp_int",
                                          "cdc_hphr_cnp_int",
                                          "cdc_hphl_cnp_int";
-                       vdd-cdc-io-supply = <&pm8916_l5>;
-                       vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
-                       vdd-micbias-supply = <&pm8916_l13>;
                        #sound-dai-cells = <1>;
                        status = "disabled";
                };