msm: board-8064: switch to RPM control for most regulators

Switch control of most regulators from the pm8xxx-regulator
driver to the rpm-regulator driver. pm8xxx-regulator will still
be used for LDO 26 because it is not handled by the RPM.
USB OTG MVS and HDMI MVS will also remain under pm8xxx-regulator
control because they are Apps-only and require integration with
GPIO control FETs to be useful.

Change-Id: I55115d8cca17f3e9046efaeb47bb5d9ebd1828fb
Signed-off-by: David Collins <collinsd@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064.h b/arch/arm/mach-msm/board-8064.h
index 6633345..d401f4c 100644
--- a/arch/arm/mach-msm/board-8064.h
+++ b/arch/arm/mach-msm/board-8064.h
@@ -18,6 +18,7 @@
 #include <linux/mfd/pm8xxx/pm8821.h>
 #include <mach/msm_memtypes.h>
 #include <mach/irqs.h>
+#include <mach/rpm-regulator.h>
 
 /* Macros assume PMIC GPIOs and MPPs start at 1 */
 #define PM8921_GPIO_BASE		NR_GPIO_IRQS
@@ -45,6 +46,9 @@
 extern struct gpio_regulator_platform_data
 	apq8064_gpio_regulator_pdata[] __devinitdata;
 
+extern struct rpm_regulator_platform_data
+	apq8064_rpm_regulator_pdata __devinitdata;
+
 extern struct regulator_init_data msm8064_saw_regulator_pdata_8921_s5;
 extern struct regulator_init_data msm8064_saw_regulator_pdata_8921_s6;
 extern struct regulator_init_data msm8064_saw_regulator_pdata_8821_s0;