msm: board-msm8960: switch to RPM control for most regulators
Switch control of most regulators from the pm8921-regulator
driver to the rpm-regulator driver. pm8921-regulator will still
be used for USB_OTG and HDMI_MVS. pm8921-regulator will also
remain in use for LDO 26, 27, 28, and 29 because these are not
handled by the RPM. saw-regulator will continue to be used for
8921_s5 and 8921_s6 (Krait rail supplies).
Also un-stub functions rpm_vreg_set_voltage and
rpm_vreg_set_frequency now that they can safely be called.
Signed-off-by: David Collins <collinsd@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm8960.h b/arch/arm/mach-msm/board-msm8960.h
index 26e82fd..6aabdda 100644
--- a/arch/arm/mach-msm/board-msm8960.h
+++ b/arch/arm/mach-msm/board-msm8960.h
@@ -14,6 +14,7 @@
#define __ARCH_ARM_MACH_MSM_BOARD_MSM8960_H
#include <mach/irqs.h>
+#include <mach/rpm-regulator.h>
#include <linux/mfd/pm8xxx/pm8921.h>
/* Macros assume PMIC GPIOs and MPPs start at 1 */
@@ -38,5 +39,8 @@
extern struct regulator_init_data msm_saw_regulator_pdata_s5;
extern struct regulator_init_data msm_saw_regulator_pdata_s6;
+extern struct rpm_regulator_platform_data msm_rpm_regulator_pdata __devinitdata;
+
extern struct pm8921_bms_battery_data palladium_1500_data;
+
#endif