ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control

These regulators are controlled by the SPMI regulator driver
instead of the RPM regulator driver in the downstream android
kernel sources. Let's remove them from the DTS here because
they'll never be used by the RPM regulator driver.

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
index e7c1577d56f4812663afc7bbb4ad262743139bf5..50966378f9e4daa7f0dbd0a1a4821d89a7f726a7 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
@@ -92,7 +92,6 @@
                                        vdd_l9_l10_l17_l22-supply = <&vreg_boost>;
                                        vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
                                        vdd_l21-supply = <&vreg_boost>;
-                                       vin_5vs-supply = <&pm8941_5v>;
 
                                        s1 {
                                                regulator-min-microvolt = <1300000>;

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 307bf6a647b30a423c7c746e493584ea27bbdbb6..0b2014fab4eab477619d737936e65bf0fea68877 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1021,7 +1021,6 @@
                                        pm8941_s1: s1 {};
                                        pm8941_s2: s2 {};
                                        pm8941_s3: s3 {};
-                                       pm8941_5v: s4 {};
 
                                        pm8941_l1: l1 {};
                                        pm8941_l2: l2 {};
@@ -1051,9 +1050,6 @@
                                        pm8941_lvs1: lvs1 {};
                                        pm8941_lvs2: lvs2 {};
                                        pm8941_lvs3: lvs3 {};
-
-                                       pm8941_5vs1: 5vs1 {};
-                                       pm8941_5vs2: 5vs2 {};
                                };
                        };
                };