arm/dt: msm8610: Switch to SPM control of PM8110 S2 regulator

Add a qcom,spm-regulator device node for the PMIC PM8110 SMPS 2
regulator which replaces the qcom,qpnp-regulator device node.
The S2 regulator supplies the four A7 processor cores.  Using
an spm-regulator device to control the S2 regulator ensures that
AVS is properly configured when the supply voltage is changed.

Change-Id: I6ef83da3c3f6b08002d1748974d23d60d498cd27
Signed-off-by: David Collins <collinsd@codeaurora.org>
diff --git a/arch/arm/boot/dts/msm8610-regulator.dtsi b/arch/arm/boot/dts/msm8610-regulator.dtsi
index f11f04b..1a88a2b 100644
--- a/arch/arm/boot/dts/msm8610-regulator.dtsi
+++ b/arch/arm/boot/dts/msm8610-regulator.dtsi
@@ -23,6 +23,20 @@
 	};
 };
 
+/* SPM controlled regulators */
+
+&spmi_bus {
+	qcom,pm8110@1 {
+		pm8110_s2: spm-regulator@1700 {
+			compatible = "qcom,spm-regulator";
+			regulator-name = "8110_s2";
+			reg = <0x1700 0x100>;
+			regulator-min-microvolt = <900000>;
+			regulator-max-microvolt = <1350000>;
+		};
+	};
+};
+
 /* QPNP controlled regulators: */
 
 &spmi_bus {
@@ -38,15 +52,6 @@
 			regulator-always-on;
 		};
 
-		pm8110_s2: regulator@1700 {
-			status = "okay";
-			regulator-min-microvolt = <1050000>;
-			regulator-max-microvolt = <1150000>;
-			qcom,enable-time = <500>;
-			qcom,system-load = <100000>;
-			regulator-always-on;
-		};
-
 		pm8110_s3: regulator@1a00 {
 			status = "okay";
 			regulator-min-microvolt = <1350000>;