commit bf3d0b1f4ba48d61a384b5ef1a7b0f401bcd4ec8
author Tianyi Gou <tgou@codeaurora.org> Mon Jan 23 14:37:28 2012 -0800
committer David Collins <collinsd@codeaurora.org> Wed Jan 25 06:52:08 2012 -0800
tree 0236635a7319e513106f92b96ebc37230946aed2
parent fff0040ea052f03b36c8cbabaf15ff7f7770d080

msm: clock-8960: Update regulator support for 8930 and 8627

8930/8627 uses the new pmic pm8038 so need to update the regulators
used by the clock driver to the corresponding pm8038 regulators.

Change-Id: I20f806575577e1023591a3998cae0218d41079e6
Signed-off-by: Tianyi Gou <tgou@codeaurora.org>

arch/arm/mach-msm/clock-8960.c

diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 8e8a966..d9e1724 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -363,6 +363,8 @@
 };
 #define PLL_RATE(l, m, n, v, d, i) { l, m, n, v, (d>>1), i }
 
+static int rpm_vreg_id_vdd_dig;
+
 enum vdd_dig_levels {
 	VDD_DIG_NONE,
 	VDD_DIG_LOW,
@@ -378,8 +380,7 @@
 		[VDD_DIG_NOMINAL] = 1050000,
 		[VDD_DIG_HIGH]    = 1150000
 	};
-
-	return rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_S3, RPM_VREG_VOTER3,
+	return rpm_vreg_set_voltage(rpm_vreg_id_vdd_dig, RPM_VREG_VOTER3,
 				    vdd_uv[level], 1150000, 1);
 }
 
@@ -405,28 +406,41 @@
 
 static int set_vdd_l23(struct clk_vdd_class *vdd_class, int level)
 {
-	int rc;
-
-	if (level == VDD_L23_OFF) {
-		rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_L23,
-				RPM_VREG_VOTER3, 0, 0, 1);
-		if (rc)
-			return rc;
-		rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_S8,
-				RPM_VREG_VOTER3, 0, 0, 1);
-		if (rc)
-			rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_L23,
-				RPM_VREG_VOTER3, 1800000, 1800000, 1);
-	} else {
-		rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_S8,
-				RPM_VREG_VOTER3, 2200000, 2200000, 1);
-		if (rc)
-			return rc;
-		rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_L23,
-				RPM_VREG_VOTER3, 1800000, 1800000, 1);
-		if (rc)
-			rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_S8,
-				RPM_VREG_VOTER3, 0, 0, 1);
+	int rc = 0;
+	if (cpu_is_msm8960()) {
+		if (level == VDD_L23_OFF) {
+			rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_L23,
+					RPM_VREG_VOTER3, 0, 0, 1);
+			if (rc)
+				return rc;
+			rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_S8,
+					RPM_VREG_VOTER3, 0, 0, 1);
+			if (rc)
+				rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_L23,
+					RPM_VREG_VOTER3, 1800000, 1800000, 1);
+		} else {
+			rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_S8,
+					RPM_VREG_VOTER3, 2200000, 2200000, 1);
+			if (rc)
+				return rc;
+			rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_L23,
+					RPM_VREG_VOTER3, 1800000, 1800000, 1);
+			if (rc)
+				rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_S8,
+						RPM_VREG_VOTER3, 0, 0, 1);
+		}
+	} else if (cpu_is_msm8930() || cpu_is_msm8627()) {
+		if (level == VDD_L23_OFF) {
+			rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8038_L23,
+					RPM_VREG_VOTER3, 0, 0, 1);
+			if (rc)
+				return rc;
+		} else {
+			rc = rpm_vreg_set_voltage(RPM_VREG_ID_PM8038_L23,
+					RPM_VREG_VOTER3, 1800000, 1800000, 1);
+			if (rc)
+				return rc;
+		}
 	}
 
 	return rc;
@@ -5641,6 +5655,13 @@
 {
 	size_t num_lookups = ARRAY_SIZE(msm_clocks_8960_v1);
 
+	if (cpu_is_msm8960() || cpu_is_apq8064())
+		rpm_vreg_id_vdd_dig = RPM_VREG_ID_PM8921_S3;
+	else if (cpu_is_msm8930() || cpu_is_msm8627())
+		rpm_vreg_id_vdd_dig = RPM_VREG_ID_PM8038_S1;
+	else
+		BUG();
+
 	xo_pxo = msm_xo_get(MSM_XO_PXO, "clock-8960");
 	if (IS_ERR(xo_pxo)) {
 		pr_err("%s: msm_xo_get(PXO) failed.\n", __func__);