ARM: dts: qcom: apq8064: move RPM regulators to board files
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Thu, 28 Sep 2023 11:03:01 +0000 (14:03 +0300)
committerBjorn Andersson <andersson@kernel.org>
Tue, 14 Nov 2023 17:26:00 +0000 (11:26 -0600)
The set of regulators available over the RPM requests is not a property
of the SoC. Move them to board files.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230928110309.1212221-29-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi

index e8f893d869807547f560e6657e519324b5f4b416..d460743fbb9401331d719e6a5e2fcf278d3744fb 100644 (file)
 
 &rpm {
        regulators {
+               compatible = "qcom,rpm-pm8921-regulators";
+
                vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
                vin_lvs1_3_6-supply = <&pm8921_s4>;
                vin_lvs4_5_7-supply = <&pm8921_s4>;
 
-
                vdd_l24-supply = <&pm8921_s1>;
                vdd_l25-supply = <&pm8921_s1>;
                vin_lvs2-supply = <&pm8921_s1>;
                vdd_ncp-supply = <&pm8921_l6>;
 
                /* Buck SMPS */
-               s1 {
+               pm8921_s1: s1 {
                        regulator-always-on;
                        regulator-min-microvolt = <1225000>;
                        regulator-max-microvolt = <1225000>;
                };
 
                /* msm otg HSUSB_VDDCX */
-               s3 {
+               pm8921_s3: s3 {
                        regulator-min-microvolt = <500000>;
                        regulator-max-microvolt = <1150000>;
                        qcom,switch-mode-frequency = <4800000>;
                 * tabla2x-slim-CDC_VDD_CP
                 * tabla2x-slim-VDDIO_CDC
                 */
-               s4 {
+               pm8921_s4: s4 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        qcom,switch-mode-frequency = <3200000>;
                        regulator-always-on;
                };
 
-               s7 {
+               pm8921_s7: s7 {
                        regulator-min-microvolt = <1300000>;
                        regulator-max-microvolt = <1300000>;
                        qcom,switch-mode-frequency = <3200000>;
                };
 
                /* mipi_dsi.1-dsi1_pll_vdda */
-               l2 {
+               pm8921_l2: l2 {
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
                        regulator-always-on;
                };
 
                /* msm_otg-HSUSB_3p3 */
-               l3 {
+               pm8921_l3: l3 {
                        regulator-min-microvolt = <3075000>;
                        regulator-max-microvolt = <3075000>;
                        bias-pull-down;
                };
 
                /* msm_otg-HSUSB_1p8 */
-               l4 {
+               pm8921_l4: l4 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        bias-pull-down;
                };
 
                /* msm_sdcc.1-sdc_vdd */
-               l5 {
+               pm8921_l5: l5 {
                        regulator-min-microvolt = <2950000>;
                        regulator-max-microvolt = <2950000>;
                        regulator-always-on;
                        bias-pull-down;
                };
 
-               l6 {
+               pm8921_l6: l6 {
                        regulator-min-microvolt = <2950000>;
                        regulator-max-microvolt = <2950000>;
                };
 
+               pm8921_l8: l8 {
+               };
+
                /* mipi_dsi.1-dsi1_avdd */
-               l11 {
+               pm8921_l11: l11 {
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        bias-pull-down;
                };
 
                /* pwm_power for backlight */
-               l17 {
+               pm8921_l17: l17 {
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        regulator-always-on;
                };
 
                /* camera, qdsp6 */
-               l23 {
+               pm8921_l23: l23 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        bias-pull-down;
                 * tabla2x-slim-CDC_VDDA_A_1P2V
                 * tabla2x-slim-VDDD_CDC_D
                 */
-               l25 {
+               pm8921_l25: l25 {
                        regulator-min-microvolt = <1250000>;
                        regulator-max-microvolt = <1250000>;
                        bias-pull-down;
                };
 
-               lvs1 {
+               pm8921_lvs1: lvs1 {
                        bias-pull-down;
                };
 
-               lvs4 {
+               pm8921_lvs4: lvs4 {
                        bias-pull-down;
                };
 
-               lvs5 {
+               pm8921_lvs5: lvs5 {
                        bias-pull-down;
                };
 
-               lvs6 {
+               pm8921_lvs6: lvs6 {
                        bias-pull-down;
                };
                /*
                 * mipi_dsi.1-dsi1_vddio
                 * pil_riva-pll_vdd
                 */
-               lvs7 {
+               pm8921_lvs7: lvs7 {
                        bias-pull-down;
                };
        };
index d4db84e9fcf35131dcd20faa918a8bafeedc25e3..671d58cc2741b04d369c589558793637dcd119c4 100644 (file)
@@ -93,6 +93,8 @@
 
 &rpm {
        regulators {
+               compatible = "qcom,rpm-pm8921-regulators";
+
                vin_lvs1_3_6-supply = <&pm8921_s4>;
                vin_lvs2-supply = <&pm8921_s1>;
                vin_lvs4_5_7-supply = <&pm8921_s4>;
                vdd_l27-supply = <&pm8921_s7>;
                vdd_l28-supply = <&pm8921_s7>;
 
-
                /* Buck SMPS */
-               s1 {
+               pm8921_s1: s1 {
                        regulator-always-on;
                        regulator-min-microvolt = <1225000>;
                        regulator-max-microvolt = <1225000>;
                        bias-pull-down;
                };
 
-               s3 {
+               pm8921_s3: s3 {
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1400000>;
                        qcom,switch-mode-frequency = <4800000>;
                };
 
-               s4 {
+               pm8921_s4: s4 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        qcom,switch-mode-frequency = <3200000>;
                };
 
-               s7 {
+               pm8921_s7: s7 {
                        regulator-min-microvolt = <1300000>;
                        regulator-max-microvolt = <1300000>;
                        qcom,switch-mode-frequency = <3200000>;
                };
 
-               l3 {
+               pm8921_l3: l3 {
                        regulator-min-microvolt = <3050000>;
                        regulator-max-microvolt = <3300000>;
                        bias-pull-down;
                };
 
-               l4 {
+               pm8921_l4: l4 {
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1800000>;
                        bias-pull-down;
                };
 
-               l5 {
+               pm8921_l5: l5 {
                        regulator-min-microvolt = <2750000>;
                        regulator-max-microvolt = <3000000>;
                        bias-pull-down;
                };
 
-               l23 {
+               pm8921_l23: l23 {
                        regulator-min-microvolt = <1700000>;
                        regulator-max-microvolt = <1900000>;
                        bias-pull-down;
                };
 
-               lvs6 {
+               pm8921_lvs6: lvs6 {
                        bias-pull-down;
                };
-
        };
 };
 
index 6aea97a0d54df58d5c68480d4f53b1e31b590001..ed86b24119c97f133096c8a67595222d978eae43 100644 (file)
 
 &rpm {
        regulators {
+               compatible = "qcom,rpm-pm8921-regulators";
+
                vin_lvs1_3_6-supply = <&pm8921_s4>;
                vin_lvs2-supply = <&pm8921_s1>;
                vin_lvs4_5_7-supply = <&pm8921_s4>;
                vdd_l27-supply = <&pm8921_s7>;
                vdd_l28-supply = <&pm8921_s7>;
 
-
                /* Buck SMPS */
-               s1 {
+               pm8921_s1: s1 {
                        regulator-always-on;
                        regulator-min-microvolt = <1225000>;
                        regulator-max-microvolt = <1225000>;
                        bias-pull-down;
                };
 
-               s3 {
+               pm8921_s3: s3 {
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1400000>;
                        qcom,switch-mode-frequency = <4800000>;
                };
 
-               s4 {
+               pm8921_s4: s4 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        qcom,switch-mode-frequency = <3200000>;
                };
 
-               s7 {
+               pm8921_s7: s7 {
                        regulator-min-microvolt = <1300000>;
                        regulator-max-microvolt = <1300000>;
                        qcom,switch-mode-frequency = <3200000>;
                };
 
-               l3 {
+               pm8921_l3: l3 {
                        regulator-min-microvolt = <3050000>;
                        regulator-max-microvolt = <3300000>;
                        bias-pull-down;
                };
 
-               l4 {
+               pm8921_l4: l4 {
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1800000>;
                        bias-pull-down;
                };
 
-               l5 {
+               pm8921_l5: l5 {
                        regulator-min-microvolt = <2750000>;
                        regulator-max-microvolt = <3000000>;
                        bias-pull-down;
                };
 
-               l6 {
+               pm8921_l6: l6 {
                        regulator-min-microvolt = <2950000>;
                        regulator-max-microvolt = <2950000>;
                        bias-pull-down;
                };
 
-               l23 {
+               pm8921_l23: l23 {
                        regulator-min-microvolt = <1700000>;
                        regulator-max-microvolt = <1900000>;
                        bias-pull-down;
                };
 
-               lvs1 {
+               pm8921_lvs1: lvs1 {
+                       bias-pull-down;
+               };
+
+               pm8921_lvs6: lvs6 {
                        bias-pull-down;
                };
 
-               lvs6 {
+               pm8921_hdmi_switch: hdmi-switch {
                        bias-pull-down;
                };
        };
index ba18a02b1c573e60c6c94f682a7e1d5779a0104e..2412aa3e3e8dbabbce398fbc706048818b37556b 100644 (file)
 &riva {
        pinctrl-names = "default";
        pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>;
+
+       vddcx-supply = <&pm8921_s3>;
+       vddmx-supply = <&pm8921_l24>;
+       vddpx-supply = <&pm8921_s4>;
+
        status = "okay";
+
+       iris {
+               vddxo-supply = <&pm8921_l4>;
+               vddrfa-supply = <&pm8921_s2>;
+               vddpa-supply = <&pm8921_l10>;
+               vdddig-supply = <&pm8921_lvs2>;
+       };
 };
 
 &rpm {
        regulators {
+               compatible = "qcom,rpm-pm8921-regulators";
+
                vin_l1_l2_l12_l18-supply = <&pm8921_s4>;
                vin_lvs_1_3_6-supply = <&pm8921_s4>;
                vin_lvs_4_5_7-supply = <&pm8921_s4>;
                vin_l28-supply = <&pm8921_s7>;
 
                /* Buck SMPS */
-               s1 {
+               pm8921_s1: s1 {
                        regulator-always-on;
                        regulator-min-microvolt = <1225000>;
                        regulator-max-microvolt = <1225000>;
                        bias-pull-down;
                };
 
-               s2 {
+               pm8921_s2: s2 {
                        regulator-min-microvolt = <1300000>;
                        regulator-max-microvolt = <1300000>;
                        qcom,switch-mode-frequency = <1600000>;
                        bias-pull-down;
                };
 
-               s3 {
+               pm8921_s3: s3 {
                        regulator-min-microvolt = <500000>;
                        regulator-max-microvolt = <1150000>;
                        qcom,switch-mode-frequency = <4800000>;
                        bias-pull-down;
                };
 
-               s4 {
+               pm8921_s4: s4 {
                        regulator-always-on;
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
                };
 
-               s7 {
+               pm8921_s7: s7 {
                        regulator-min-microvolt = <1300000>;
                        regulator-max-microvolt = <1300000>;
                        qcom,switch-mode-frequency = <3200000>;
                };
 
-               s8 {
+               pm8921_s8: s8 {
                        regulator-min-microvolt = <2200000>;
                        regulator-max-microvolt = <2200000>;
                        qcom,switch-mode-frequency = <1600000>;
                };
 
                /* PMOS LDO */
-               l1 {
+               pm8921_l1: l1 {
                        regulator-always-on;
                        regulator-min-microvolt = <1100000>;
                        regulator-max-microvolt = <1100000>;
                        bias-pull-down;
                };
 
-               l2 {
+               pm8921_l2: l2 {
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
                        bias-pull-down;
                };
 
-               l3 {
+               pm8921_l3: l3 {
                        regulator-min-microvolt = <3075000>;
                        regulator-max-microvolt = <3075000>;
                        bias-pull-down;
                };
 
-               l4 {
+               pm8921_l4: l4 {
                        regulator-always-on;
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        bias-pull-down;
                };
 
-               l5 {
+               pm8921_l5: l5 {
                        regulator-min-microvolt = <2950000>;
                        regulator-max-microvolt = <2950000>;
                        bias-pull-down;
                };
 
-               l6 {
+               pm8921_l6: l6 {
                        regulator-min-microvolt = <2950000>;
                        regulator-max-microvolt = <2950000>;
                        bias-pull-down;
                };
 
-               l7 {
+               pm8921_l7: l7 {
                        regulator-min-microvolt = <1850000>;
                        regulator-max-microvolt = <2950000>;
                        bias-pull-down;
                };
 
-               l8 {
+               pm8921_l8: l8 {
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
                        bias-pull-down;
                };
 
-               l9 {
+               pm8921_l9: l9 {
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        bias-pull-down;
                };
 
-               l10 {
+               pm8921_l10: l10 {
                        regulator-min-microvolt = <2900000>;
                        regulator-max-microvolt = <2900000>;
                        bias-pull-down;
                };
 
-               l11 {
+               pm8921_l11: l11 {
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
                        bias-pull-down;
                };
 
-               l12 {
+               pm8921_l12: l12 {
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
                        bias-pull-down;
                };
 
-               l14 {
+               pm8921_l14: l14 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        bias-pull-down;
                };
 
-               l15 {
+               pm8921_l15: l15 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <2950000>;
                        bias-pull-down;
                };
 
-               l16 {
+               pm8921_l16: l16 {
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
                        bias-pull-down;
                };
 
-               l17 {
+               pm8921_l17: l17 {
                        regulator-min-microvolt = <2000000>;
                        regulator-max-microvolt = <2000000>;
                        bias-pull-down;
                };
 
-               l18 {
+               pm8921_l18: l18 {
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
                        bias-pull-down;
                };
 
-               l21 {
+               pm8921_l21: l21 {
                        regulator-min-microvolt = <1050000>;
                        regulator-max-microvolt = <1050000>;
                        bias-pull-down;
                };
 
-               l22 {
+               pm8921_l22: l22 {
                        regulator-min-microvolt = <2600000>;
                        regulator-max-microvolt = <2600000>;
                        bias-pull-down;
                };
 
-               l23 {
+               pm8921_l23: l23 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        bias-pull-down;
                };
 
-               l24 {
+               pm8921_l24: l24 {
                        regulator-min-microvolt = <750000>;
                        regulator-max-microvolt = <1150000>;
                        bias-pull-down;
                };
 
-               l25 {
+               pm8921_l25: l25 {
                        regulator-always-on;
                        regulator-min-microvolt = <1250000>;
                        regulator-max-microvolt = <1250000>;
                        bias-pull-down;
                };
 
-               l27 {
+               pm8921_l27: l27 {
                        regulator-min-microvolt = <1100000>;
                        regulator-max-microvolt = <1100000>;
                };
 
-               l28 {
+               pm8921_l28: l28 {
                        regulator-min-microvolt = <1050000>;
                        regulator-max-microvolt = <1050000>;
                        bias-pull-down;
                };
 
-               l29 {
+               pm8921_l29: l29 {
                        regulator-min-microvolt = <2000000>;
                        regulator-max-microvolt = <2000000>;
                        bias-pull-down;
                };
 
                /* Low Voltage Switch */
-               lvs1 {
+               pm8921_lvs1: lvs1 {
                        bias-pull-down;
                };
 
-               lvs2 {
+               pm8921_lvs2: lvs2 {
                        bias-pull-down;
                };
 
-               lvs3 {
+               pm8921_lvs3: lvs3 {
                        bias-pull-down;
                };
 
-               lvs4 {
+               pm8921_lvs4: lvs4 {
                        bias-pull-down;
                };
 
-               lvs5 {
+               pm8921_lvs5: lvs5 {
                        bias-pull-down;
                };
 
-               lvs6 {
+               pm8921_lvs6: lvs6 {
                        bias-pull-down;
                };
 
-               lvs7 {
+               pm8921_lvs7: lvs7 {
                        bias-pull-down;
                };
 
-               usb-switch {};
+               pm8921_usb_switch: usb-switch {};
 
-               hdmi-switch {};
+               pm8921_hdmi_switch: hdmi-switch {
+                       bias-pull-down;
+               };
 
-               ncp {
+               pm8921_ncp: ncp {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        qcom,switch-mode-frequency = <1600000>;
index f7c6db3a0fdd42ed8e86503e119f26a733d61a4b..95ac25e1a3b4bb5002dd1ea650afc7dd34e05681 100644 (file)
                                clocks = <&pxo_board>, <&cxo_board>;
                                clock-names = "pxo", "cxo";
                        };
-
-                       regulators {
-                               compatible = "qcom,rpm-pm8921-regulators";
-
-                               pm8921_s1: s1 {};
-                               pm8921_s2: s2 {};
-                               pm8921_s3: s3 {};
-                               pm8921_s4: s4 {};
-                               pm8921_s7: s7 {};
-                               pm8921_s8: s8 {};
-
-                               pm8921_l1: l1 {};
-                               pm8921_l2: l2 {};
-                               pm8921_l3: l3 {};
-                               pm8921_l4: l4 {};
-                               pm8921_l5: l5 {};
-                               pm8921_l6: l6 {};
-                               pm8921_l7: l7 {};
-                               pm8921_l8: l8 {};
-                               pm8921_l9: l9 {};
-                               pm8921_l10: l10 {};
-                               pm8921_l11: l11 {};
-                               pm8921_l12: l12 {};
-                               pm8921_l14: l14 {};
-                               pm8921_l15: l15 {};
-                               pm8921_l16: l16 {};
-                               pm8921_l17: l17 {};
-                               pm8921_l18: l18 {};
-                               pm8921_l21: l21 {};
-                               pm8921_l22: l22 {};
-                               pm8921_l23: l23 {};
-                               pm8921_l24: l24 {};
-                               pm8921_l25: l25 {};
-                               pm8921_l26: l26 {};
-                               pm8921_l27: l27 {};
-                               pm8921_l28: l28 {};
-                               pm8921_l29: l29 {};
-
-                               pm8921_lvs1: lvs1 {};
-                               pm8921_lvs2: lvs2 {};
-                               pm8921_lvs3: lvs3 {};
-                               pm8921_lvs4: lvs4 {};
-                               pm8921_lvs5: lvs5 {};
-                               pm8921_lvs6: lvs6 {};
-                               pm8921_lvs7: lvs7 {};
-
-                               pm8921_usb_switch: usb-switch {};
-
-                               pm8921_hdmi_switch: hdmi-switch {
-                                       bias-pull-down;
-                               };
-
-                               pm8921_ncp: ncp {};
-                       };
                };
 
                usb1: usb@12500000 {
 
                        memory-region = <&wcnss_mem>;
 
-                       vddcx-supply = <&pm8921_s3>;
-                       vddmx-supply = <&pm8921_l24>;
-                       vddpx-supply = <&pm8921_s4>;
-
                        status = "disabled";
 
                        iris {
 
                                clocks = <&cxo_board>;
                                clock-names = "xo";
-
-                               vddxo-supply = <&pm8921_l4>;
-                               vddrfa-supply = <&pm8921_s2>;
-                               vddpa-supply = <&pm8921_l10>;
-                               vdddig-supply = <&pm8921_lvs2>;
                        };
 
                        smd-edge {