commit b5e1cda59501d61c64728bef90d318b9877c3923
author Vikram Mulukutla <markivx@codeaurora.org> Tue Oct 04 16:17:22 2011 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Oct 24 04:09:11 2011 -0600
tree ac6d3d60b34bc4504a197e5ee5bbb384bea10aaa
parent 87c1fd03c227ca8a77fcb3b681ce293c2af4e085

msm: clock-9615: Add rpm regulator support

Change-Id: I93d40c8de93cd1b7e451c4093c04fc7a8914c2ad
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>

arch/arm/mach-msm/board-9615.c

diff --git a/arch/arm/mach-msm/board-9615.c b/arch/arm/mach-msm/board-9615.c
index 82a0bb9..40cbee0 100644
--- a/arch/arm/mach-msm/board-9615.c
+++ b/arch/arm/mach-msm/board-9615.c
@@ -29,6 +29,7 @@
 #include "board-9615.h"
 #include "cpuidle.h"
 #include "pm.h"
+#include "acpuclock.h"
 
 static struct pm8xxx_irq_platform_data pm8xxx_irq_pdata __devinitdata = {
 	.irq_base		= PM8018_IRQ_BASE,
@@ -563,6 +564,9 @@
 	msm_device_gadget_peripheral.dev.parent = &msm_device_otg.dev;
 	platform_add_devices(common_devices, ARRAY_SIZE(common_devices));
 
+	msm_clock_init(&msm9615_clock_init_data);
+	acpuclk_init(&acpuclk_9615_soc_data);
+
 	msm9615_init_mmc();
 	msm_pm_set_platform_data(msm_pm_data, ARRAY_SIZE(msm_pm_data));
 	msm_pm_set_rpm_wakeup_irq(RPM_APCC_CPU0_WAKE_UP_IRQ);

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

diff --git a/arch/arm/mach-msm/clock-9615.c b/arch/arm/mach-msm/clock-9615.c
index 84121ef..63d3f72 100644
--- a/arch/arm/mach-msm/clock-9615.c
+++ b/arch/arm/mach-msm/clock-9615.c
@@ -27,6 +27,7 @@
 #include <mach/clk.h>
 #include <mach/msm_xo.h>
 #include <mach/rpm-9615.h>
+#include <mach/rpm-regulator.h>
 
 #include "clock-local.h"
 #include "clock-voter.h"
@@ -290,17 +291,14 @@
 /* Update the sys_vdd voltage given a level. */
 static int msm9615_update_sys_vdd(enum sys_vdd_level level)
 {
-	/* TODO: Implement when rpm-regulator is ready.
 	static const int vdd_uv[] = {
-		[NONE...LOW] =  945000,
-		[NOMINAL]    = 1050000,
+		[NONE...LOW] = 1150000,
+		[NOMINAL]    = 1150000,
 		[HIGH]       = 1150000,
 	};
 
-	return rpm_vreg_set_voltage(RPM_VREG_ID_PM8921_S3, RPM_VREG_VOTER3,
+	return rpm_vreg_set_voltage(RPM_VREG_ID_PM8018_S1, RPM_VREG_VOTER3,
 				    vdd_uv[level], vdd_uv[HIGH], 1);
-	*/
-	return 0;
 }
 
 static int soc_clk_reset(struct clk *clk, enum clk_reset_action action)

arch/arm/mach-msm/devices-9615.c

diff --git a/arch/arm/mach-msm/devices-9615.c b/arch/arm/mach-msm/devices-9615.c
index 77a6556..74e7871 100644
--- a/arch/arm/mach-msm/devices-9615.c
+++ b/arch/arm/mach-msm/devices-9615.c
@@ -30,7 +30,6 @@
 #include <mach/msm_sps.h>
 #include <mach/dma.h>
 #include "devices.h"
-#include "acpuclock.h"
 #include "mpm.h"
 #include "spm.h"
 #include "pm.h"
@@ -791,8 +790,6 @@
 void __init msm9615_device_init(void)
 {
 	msm_spm_init(msm_spm_data, ARRAY_SIZE(msm_spm_data));
-	msm_clock_init(&msm9615_clock_init_data);
-	acpuclk_init(&acpuclk_9615_soc_data);
 	BUG_ON(msm_rpm_init(&msm_rpm_data));
 	BUG_ON(msm_rpmrs_levels_init(msm_rpmrs_levels,
 			ARRAY_SIZE(msm_rpmrs_levels)));