arm64: dts: qcom: msm8996: Move regulators to db820c

As the definition of available PMICs and the names of their outputs are
board specifc move this to db820c.dtsi

Acked-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
index 21e029afb27bb44193b6d799f2e3df2cb0306fe6..fc6273b0215de89c7fb38ba403588d4ffbc5a762 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
@@ -513,163 +513,165 @@
                        gpios = <&pm8994_gpios 2 GPIO_ACTIVE_LOW>;
                };
        };
+};
 
-       rpm-glink {
-               rpm_requests {
-                       pm8994-regulators {
-                               vdd_l1-supply = <&pm8994_s3>;
-                               vdd_l2_l26_l28-supply = <&pm8994_s3>;
-                               vdd_l3_l11-supply = <&pm8994_s3>;
-                               vdd_l4_l27_l31-supply = <&pm8994_s3>;
-                               vdd_l5_l7-supply = <&pm8994_s5>;
-                               vdd_l14_l15-supply = <&pm8994_s5>;
-                               vdd_l20_l21-supply = <&pm8994_s5>;
-                               vdd_l25-supply = <&pm8994_s3>;
-
-                               s3 {
-                                       regulator-min-microvolt = <1300000>;
-                                       regulator-max-microvolt = <1300000>;
-                               };
-
-                               /**
-                                * 1.8v required on LS expansion
-                                * for mezzanine boards
-                                */
-                               s4 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       regulator-always-on;
-                               };
-                               s5 {
-                                       regulator-min-microvolt = <2150000>;
-                                       regulator-max-microvolt = <2150000>;
-                               };
-                               s7 {
-                                       regulator-min-microvolt = <800000>;
-                                       regulator-max-microvolt = <800000>;
-                               };
-
-                               l1 {
-                                       regulator-min-microvolt = <1000000>;
-                                       regulator-max-microvolt = <1000000>;
-                               };
-                               l2 {
-                                       regulator-min-microvolt = <1250000>;
-                                       regulator-max-microvolt = <1250000>;
-                               };
-                               l3 {
-                                       regulator-min-microvolt = <850000>;
-                                       regulator-max-microvolt = <850000>;
-                               };
-                               l4 {
-                                       regulator-min-microvolt = <1225000>;
-                                       regulator-max-microvolt = <1225000>;
-                               };
-                               l6 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                               };
-                               l8 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                               };
-                               l9 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                               };
-                               l10 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                               };
-                               l11 {
-                                       regulator-min-microvolt = <1150000>;
-                                       regulator-max-microvolt = <1150000>;
-                               };
-                               l12 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                               };
-                               l13 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <2950000>;
-                               };
-                               l14 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                               };
-                               l15 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                               };
-                               l16 {
-                                       regulator-min-microvolt = <2700000>;
-                                       regulator-max-microvolt = <2700000>;
-                               };
-                               l17 {
-                                       regulator-min-microvolt = <2500000>;
-                                       regulator-max-microvolt = <2500000>;
-                               };
-                               l18 {
-                                       regulator-min-microvolt = <2700000>;
-                                       regulator-max-microvolt = <2900000>;
-                               };
-                               l19 {
-                                       regulator-min-microvolt = <3000000>;
-                                       regulator-max-microvolt = <3000000>;
-                               };
-                               l20 {
-                                       regulator-min-microvolt = <2950000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       regulator-allow-set-load;
-                               };
-                               l21 {
-                                       regulator-min-microvolt = <2950000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       regulator-allow-set-load;
-                                       regulator-system-load = <200000>;
-                               };
-                               l22 {
-                                       regulator-min-microvolt = <3300000>;
-                                       regulator-max-microvolt = <3300000>;
-                               };
-                               l23 {
-                                       regulator-min-microvolt = <2800000>;
-                                       regulator-max-microvolt = <2800000>;
-                               };
-                               l24 {
-                                       regulator-min-microvolt = <3075000>;
-                                       regulator-max-microvolt = <3075000>;
-                               };
-                               l25 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                                       regulator-allow-set-load;
-                               };
-                               l27 {
-                                       regulator-min-microvolt = <1000000>;
-                                       regulator-max-microvolt = <1000000>;
-                               };
-                               l28 {
-                                       regulator-min-microvolt = <925000>;
-                                       regulator-max-microvolt = <925000>;
-                                       regulator-allow-set-load;
-                               };
-                               l29 {
-                                       regulator-min-microvolt = <2800000>;
-                                       regulator-max-microvolt = <2800000>;
-                               };
-                               l30 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                               };
-                               l32 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                               };
-                       };
+&rpm_requests {
+       pm8994-regulators {
+               compatible = "qcom,rpm-pm8994-regulators";
+
+               vdd_l1-supply = <&pm8994_s3>;
+               vdd_l2_l26_l28-supply = <&pm8994_s3>;
+               vdd_l3_l11-supply = <&pm8994_s3>;
+               vdd_l4_l27_l31-supply = <&pm8994_s3>;
+               vdd_l5_l7-supply = <&pm8994_s5>;
+               vdd_l14_l15-supply = <&pm8994_s5>;
+               vdd_l20_l21-supply = <&pm8994_s5>;
+               vdd_l25-supply = <&pm8994_s3>;
+
+               pm8994_s3: s3 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+               };
+
+               /**
+                * 1.8v required on LS expansion
+                * for mezzanine boards
+                */
+               pm8994_s4: s4 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+               };
+               pm8994_s5: s5 {
+                       regulator-min-microvolt = <2150000>;
+                       regulator-max-microvolt = <2150000>;
+               };
+               pm8994_s7: s7 {
+                       regulator-min-microvolt = <800000>;
+                       regulator-max-microvolt = <800000>;
+               };
+
+               pm8994_l1: l1 {
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+               };
+               pm8994_l2: l2 {
+                       regulator-min-microvolt = <1250000>;
+                       regulator-max-microvolt = <1250000>;
+               };
+               pm8994_l3: l3 {
+                       regulator-min-microvolt = <850000>;
+                       regulator-max-microvolt = <850000>;
+               };
+               pm8994_l4: l4 {
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+               };
+               pm8994_l6: l6 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+               pm8994_l8: l8 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               pm8994_l9: l9 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               pm8994_l10: l10 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               pm8994_l11: l11 {
+                       regulator-min-microvolt = <1150000>;
+                       regulator-max-microvolt = <1150000>;
+               };
+               pm8994_l12: l12 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               pm8994_l13: l13 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+               };
+               pm8994_l14: l14 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               pm8994_l15: l15 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               pm8994_l16: l16 {
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2700000>;
+               };
+               pm8994_l17: l17 {
+                       regulator-min-microvolt = <2500000>;
+                       regulator-max-microvolt = <2500000>;
+               };
+               pm8994_l18: l18 {
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2900000>;
+               };
+               pm8994_l19: l19 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+               };
+               pm8994_l20: l20 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-allow-set-load;
+               };
+               pm8994_l21: l21 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-allow-set-load;
+                       regulator-system-load = <200000>;
+               };
+               pm8994_l22: l22 {
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+               };
+               pm8994_l23: l23 {
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+               };
+               pm8994_l24: l24 {
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3075000>;
+               };
+               pm8994_l25: l25 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       regulator-allow-set-load;
+               };
+               pm8994_l27: l27 {
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+               };
+               pm8994_l28: l28 {
+                       regulator-min-microvolt = <925000>;
+                       regulator-max-microvolt = <925000>;
+                       regulator-allow-set-load;
+               };
+               pm8994_l29: l29 {
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+               };
+               pm8994_l30: l30 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+               pm8994_l32: l32 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
                };
        };
+};
 
+/ {
        usb2_id: usb2-id {
                compatible = "linux,extcon-usb-gpio";
                id-gpio = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index f3f27415ac6137f646fbda9f1376372e87781b2b..a6c5c078bdfa069a8688c394b9ce8a6ee42dedcf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -467,7 +467,7 @@
 
                mboxes = <&apcs_glb 0>;
 
-               rpm_requests {
+               rpm_requests: rpm-requests {
                        compatible = "qcom,rpm-msm8996";
                        qcom,glink-channels = "rpm_requests";
 
@@ -509,57 +509,6 @@
                                        };
                                };
                        };
-
-                       pm8994-regulators {
-                               compatible = "qcom,rpm-pm8994-regulators";
-
-                               pm8994_s1: s1 {};
-                               pm8994_s2: s2 {};
-                               pm8994_s3: s3 {};
-                               pm8994_s4: s4 {};
-                               pm8994_s5: s5 {};
-                               pm8994_s6: s6 {};
-                               pm8994_s7: s7 {};
-                               pm8994_s8: s8 {};
-                               pm8994_s9: s9 {};
-                               pm8994_s10: s10 {};
-                               pm8994_s11: s11 {};
-                               pm8994_s12: s12 {};
-
-                               pm8994_l1: l1 {};
-                               pm8994_l2: l2 {};
-                               pm8994_l3: l3 {};
-                               pm8994_l4: l4 {};
-                               pm8994_l5: l5 {};
-                               pm8994_l6: l6 {};
-                               pm8994_l7: l7 {};
-                               pm8994_l8: l8 {};
-                               pm8994_l9: l9 {};
-                               pm8994_l10: l10 {};
-                               pm8994_l11: l11 {};
-                               pm8994_l12: l12 {};
-                               pm8994_l13: l13 {};
-                               pm8994_l14: l14 {};
-                               pm8994_l15: l15 {};
-                               pm8994_l16: l16 {};
-                               pm8994_l17: l17 {};
-                               pm8994_l18: l18 {};
-                               pm8994_l19: l19 {};
-                               pm8994_l20: l20 {};
-                               pm8994_l21: l21 {};
-                               pm8994_l22: l22 {};
-                               pm8994_l23: l23 {};
-                               pm8994_l24: l24 {};
-                               pm8994_l25: l25 {};
-                               pm8994_l26: l26 {};
-                               pm8994_l27: l27 {};
-                               pm8994_l28: l28 {};
-                               pm8994_l29: l29 {};
-                               pm8994_l30: l30 {};
-                               pm8994_l31: l31 {};
-                               pm8994_l32: l32 {};
-                       };
-
                };
        };