mfd: 88pm860x: Use REG resource in regulator

Since IORESOURCE_IO is changed to IORESOURCE_REG in 88pm860x driver,
update self-defined IORESOURCE_IO resource to register offset that
is IORESOURCE_REG in regulator driver. And split regulator platform
data array into scattered platform data.

Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/mfd/88pm860x.h b/include/linux/mfd/88pm860x.h
index 2d042f972c68..87c933d1b912 100644
--- a/include/linux/mfd/88pm860x.h
+++ b/include/linux/mfd/88pm860x.h
@@ -359,7 +359,22 @@ struct pm860x_platform_data {
         struct pm860x_rtc_pdata         *rtc;
         struct pm860x_touch_pdata       *touch;
         struct pm860x_power_pdata       *power;
-        struct regulator_init_data      *regulator;
+        struct regulator_init_data      *buck1;
+        struct regulator_init_data      *buck2;
+        struct regulator_init_data      *buck3;
+        struct regulator_init_data      *ldo1;
+        struct regulator_init_data      *ldo2;
+        struct regulator_init_data      *ldo3;
+        struct regulator_init_data      *ldo4;
+        struct regulator_init_data      *ldo5;
+        struct regulator_init_data      *ldo6;
+        struct regulator_init_data      *ldo7;
+        struct regulator_init_data      *ldo8;
+        struct regulator_init_data      *ldo9;
+        struct regulator_init_data      *ldo10;
+        struct regulator_init_data      *ldo12;
+        struct regulator_init_data      *ldo_vibrator;
+        struct regulator_init_data      *ldo14;
 
         unsigned short  companion_addr; /* I2C address of companion chip */
         int             i2c_port;       /* Controlled by GI2C or PI2C */
@@ -367,7 +382,6 @@ struct pm860x_platform_data {
         int             irq_base;       /* IRQ base number of 88pm860x */
         int             num_leds;
         int             num_backlights;
-        int             num_regulators;
 };
 
 extern int pm8606_osc_enable(struct pm860x_chip *, unsigned short);