arm/dt: msm8610: Add the on-demand supplies for audio codec

There are several supplies needed for audio codec to function. But some
of the supplies can be disabled if not needed to reduce the system power
assumption. Add the on-demand supplies so the audio codec driver can
disable or enable these supplies.

Change-Id: I3d996533e5fd70995c8195567bfa5392548d8f27
CRs-Fixed: 480759
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
diff --git a/arch/arm/boot/dts/msm8610-cdp.dts b/arch/arm/boot/dts/msm8610-cdp.dts
index 6891b90..6b61317 100644
--- a/arch/arm/boot/dts/msm8610-cdp.dts
+++ b/arch/arm/boot/dts/msm8610-cdp.dts
@@ -149,12 +149,12 @@
 		compatible = "qcom,msm8x10-wcd-i2c";
 		reg = <0x0d>;
 		cdc-vdda-cp-supply = <&pm8110_s4>;
-		qcom,cdc-vdda-cp-voltage = <2150000 2150000>;
+		qcom,cdc-vdda-cp-voltage = <1800000 2150000>;
 		qcom,cdc-vdda-cp-current = <650000>;
 
 		cdc-vdda-h-supply = <&pm8110_l6>;
 		qcom,cdc-vdda-h-voltage = <1800000 1800000>;
-		qcom,cdc-vdda-h-current = <250000>;
+		qcom,cdc-vdda-h-current = <25000>;
 
 		cdc-vdd-px-supply = <&pm8110_l6>;
 		qcom,cdc-vdd-px-voltage = <1800000 1800000>;
@@ -171,6 +171,13 @@
 		qcom,cdc-micbias-cfilt-sel = <0x0>;
 		qcom,cdc-micbias-cfilt-mv = <1800000>;
 		qcom,cdc-mclk-clk-rate = <12288000>;
+
+		qcom,cdc-static-supplies = "cdc-vdda-h",
+					   "cdc-vdd-px",
+					   "cdc-vdd-1p2v";
+
+		qcom,cdc-on-demand-supplies = "cdc-vdda-cp",
+					      "cdc-vdd-mic-bias";
 	};
 
 	msm8x10_wcd_codec@77{
diff --git a/arch/arm/boot/dts/msm8610-mtp.dts b/arch/arm/boot/dts/msm8610-mtp.dts
index ddbe3a0..27381e2 100644
--- a/arch/arm/boot/dts/msm8610-mtp.dts
+++ b/arch/arm/boot/dts/msm8610-mtp.dts
@@ -149,7 +149,7 @@
 		compatible = "qcom,msm8x10-wcd-i2c";
 		reg = <0x0d>;
 		cdc-vdda-cp-supply = <&pm8110_s4>;
-		qcom,cdc-vdda-cp-voltage = <2150000 2150000>;
+		qcom,cdc-vdda-cp-voltage = <1800000 2150000>;
 		qcom,cdc-vdda-cp-current = <650000>;
 
 		cdc-vdda-h-supply = <&pm8110_l6>;
@@ -171,6 +171,13 @@
 		qcom,cdc-micbias-cfilt-sel = <0x0>;
 		qcom,cdc-micbias-cfilt-mv = <1800000>;
 		qcom,cdc-mclk-clk-rate = <12288000>;
+
+		qcom,cdc-static-supplies = "cdc-vdda-h",
+					   "cdc-vdd-px",
+					   "cdc-vdd-1p2v";
+
+		qcom,cdc-on-demand-supplies = "cdc-vdda-cp",
+					      "cdc-vdd-mic-bias";
 	};
 
 	msm8x10_wcd_codec@77{
diff --git a/arch/arm/boot/dts/msm8610-regulator.dtsi b/arch/arm/boot/dts/msm8610-regulator.dtsi
index 09520c5..489be74 100644
--- a/arch/arm/boot/dts/msm8610-regulator.dtsi
+++ b/arch/arm/boot/dts/msm8610-regulator.dtsi
@@ -111,7 +111,7 @@
 	rpm-regulator-smpa4 {
 		status = "okay";
 		pm8110_s4: regulator-s4 {
-			regulator-min-microvolt = <2150000>;
+			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <2150000>;
 			qcom,init-voltage = <2150000>;
 			status = "okay";