commit 49f22fce3389a6a200422128bb93e42b34aea6fe
author Linux Build Service Account <lnxbuild@localhost> Fri Mar 22 15:46:33 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 22 15:46:32 2013 -0700
tree 879cd2037e1c5bb565819ef900741a262fd00fe6
parent 943b7a2e5abbf111b80927d5fd41caf67b1bee00
parent 03d33c1cf8e4ed6fd857a5e102f5ebda39a350a0

Merge "arm/dt: msm8226: Switch to SPM control of PM8226 S2 regulator"

arch/arm/boot/dts/msm8226-regulator.dtsi

diff --git a/arch/arm/boot/dts/msm8226-regulator.dtsi b/arch/arm/boot/dts/msm8226-regulator.dtsi
index c39d987..448a5be 100644
--- a/arch/arm/boot/dts/msm8226-regulator.dtsi
+++ b/arch/arm/boot/dts/msm8226-regulator.dtsi
@@ -10,18 +10,16 @@
  * GNU General Public License for more details.
  */
 
-/* QPNP controlled regulators: */
+/* SPM controlled regulators: */
 
 &spmi_bus {
 	qcom,pm8226@1 {
-		pm8226_s2: regulator@1700 {
-			status = "okay";
+		pm8226_s2: spm-regulator@1700 {
+			compatible = "qcom,spm-regulator";
 			regulator-name = "8226_s2";
-			qcom,enable-time = <500>;
-			qcom,system-load = <100000>;
-			regulator-min-microvolt = <1050000>;
-			regulator-max-microvolt = <1150000>;
-			regulator-always-on;
+			reg = <0x1700 0x100>;
+			regulator-min-microvolt = <900000>;
+			regulator-max-microvolt = <1275000>;
 		};
 	};
 };