diff mbox

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

Message ID 20170127004728.22490-2-stephen.boyd@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Stephen Boyd Jan. 27, 2017, 12:47 a.m. UTC
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>
---
 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 1 -
 arch/arm/boot/dts/qcom-msm8974.dtsi                   | 4 ----
 2 files changed, 5 deletions(-)

Comments

Bjorn Andersson May 24, 2017, 7:18 p.m. UTC | #1
On Thu 26 Jan 16:47 PST 2017, Stephen Boyd wrote:

> 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>

Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>

But the same vin_5vs-supply property can be found in
qcom-apq8074-dragonboard.dts, so that should probably also go.

Regards,
Bjorn

> Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
> ---
>  arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 1 -
>  arch/arm/boot/dts/qcom-msm8974.dtsi                   | 4 ----
>  2 files changed, 5 deletions(-)
> 
> 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 e7c1577d56f4..50966378f9e4 100644
> --- 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 0e9bbede860d..6c167c031368 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -735,7 +735,6 @@
>  					pm8941_s1: s1 {};
>  					pm8941_s2: s2 {};
>  					pm8941_s3: s3 {};
> -					pm8941_5v: s4 {};
>  
>  					pm8941_l1: l1 {};
>  					pm8941_l2: l2 {};
> @@ -765,9 +764,6 @@
>  					pm8941_lvs1: lvs1 {};
>  					pm8941_lvs2: lvs2 {};
>  					pm8941_lvs3: lvs3 {};
> -
> -					pm8941_5vs1: 5vs1 {};
> -					pm8941_5vs2: 5vs2 {};
>  				};
>  			};
>  		};
> -- 
> 2.10.0.297.gf6727b0
>
diff mbox

Patch

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 e7c1577d56f4..50966378f9e4 100644
--- 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 0e9bbede860d..6c167c031368 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -735,7 +735,6 @@ 
 					pm8941_s1: s1 {};
 					pm8941_s2: s2 {};
 					pm8941_s3: s3 {};
-					pm8941_5v: s4 {};
 
 					pm8941_l1: l1 {};
 					pm8941_l2: l2 {};
@@ -765,9 +764,6 @@ 
 					pm8941_lvs1: lvs1 {};
 					pm8941_lvs2: lvs2 {};
 					pm8941_lvs3: lvs3 {};
-
-					pm8941_5vs1: 5vs1 {};
-					pm8941_5vs2: 5vs2 {};
 				};
 			};
 		};