The controlling GPIO for the regulator (even if it is unified by design)
is not a property of SoC, so move it to board files.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
---
arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 4 ++++
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 4 ++++
arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 1 -
arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 4 ++++
arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 4 ++++
.../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 4 ++++
6 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
index da99f770d4f5..eccd8f536bce 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -694,3 +694,7 @@ &usb_hs1_phy {
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
index 23ae474698aa..c8f914c4ebc4 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -493,3 +493,7 @@ &usb_hs1_phy {
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
index aeca504918a0..a8f1c5d76bcd 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@ -2387,7 +2387,6 @@ vreg_boost: vreg-boost {
regulator-always-on;
regulator-boot-on;
- gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
index 24f9521a0be6..ba94186792d5 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
@@ -461,3 +461,7 @@ &usb_hs1_phy {
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
index c0ca264d8140..b95fd5f2a481 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
@@ -510,3 +510,7 @@ &usb_hs1_phy {
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index efe21289c9fe..09514324d444 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -672,3 +672,7 @@ &usb_hs1_phy {
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
+
+&vreg_boost {
+ gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+};
--
2.39.2
