1 files changed, 15 insertions, 17 deletions

diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index 04719551381b..97897a6bf4f3 100644
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -11,15 +11,17 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/mfd/88pm8607.h>
+#include <linux/mfd/88pm860x.h>
 
 struct pm8607_regulator_info {
         struct regulator_desc   desc;
-        struct pm8607_chip      *chip;
+        struct pm860x_chip      *chip;
         struct regulator_dev    *regulator;
+        struct i2c_client       *i2c;
 
         int     min_uV;
         int     max_uV;
@@ -46,7 +48,7 @@ static inline int check_range(struct pm8607_regulator_info *info,
 static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index)
 {
         struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-        uint8_t chip_id = info->chip->chip_id;
+        uint8_t chip_id = info->chip->chip_version;
         int ret = -EINVAL;
 
         switch (info->desc.id) {
@@ -169,7 +171,7 @@ static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index)
 static int choose_voltage(struct regulator_dev *rdev, int min_uV, int max_uV)
 {
         struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-        uint8_t chip_id = info->chip->chip_id;
+        uint8_t chip_id = info->chip->chip_version;
         int val = -ENOENT;
         int ret;
 
@@ -428,7 +430,6 @@ static int pm8607_set_voltage(struct regulator_dev *rdev,
                               int min_uV, int max_uV)
 {
         struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-        struct pm8607_chip *chip = info->chip;
         uint8_t val, mask;
         int ret;
 
@@ -443,13 +444,13 @@ static int pm8607_set_voltage(struct regulator_dev *rdev,
         val = (uint8_t)(ret << info->vol_shift);
         mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;
 
-        ret = pm8607_set_bits(chip, info->vol_reg, mask, val);
+        ret = pm860x_set_bits(info->i2c, info->vol_reg, mask, val);
         if (ret)
                 return ret;
         switch (info->desc.id) {
         case PM8607_ID_BUCK1:
         case PM8607_ID_BUCK3:
-                ret = pm8607_set_bits(chip, info->update_reg,
+                ret = pm860x_set_bits(info->i2c, info->update_reg,
                                       1 << info->update_bit,
                                       1 << info->update_bit);
                 break;
@@ -460,11 +461,10 @@ static int pm8607_set_voltage(struct regulator_dev *rdev,
 static int pm8607_get_voltage(struct regulator_dev *rdev)
 {
         struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-        struct pm8607_chip *chip = info->chip;
         uint8_t val, mask;
         int ret;
 
-        ret = pm8607_reg_read(chip, info->vol_reg);
+        ret = pm860x_reg_read(info->i2c, info->vol_reg);
         if (ret < 0)
                 return ret;
 
@@ -477,9 +477,8 @@ static int pm8607_get_voltage(struct regulator_dev *rdev)
 static int pm8607_enable(struct regulator_dev *rdev)
 {
         struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-        struct pm8607_chip *chip = info->chip;
 
-        return pm8607_set_bits(chip, info->enable_reg,
+        return pm860x_set_bits(info->i2c, info->enable_reg,
                                1 << info->enable_bit,
                                1 << info->enable_bit);
 }
@@ -487,19 +486,17 @@ static int pm8607_enable(struct regulator_dev *rdev)
 static int pm8607_disable(struct regulator_dev *rdev)
 {
         struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-        struct pm8607_chip *chip = info->chip;
 
-        return pm8607_set_bits(chip, info->enable_reg,
+        return pm860x_set_bits(info->i2c, info->enable_reg,
                                1 << info->enable_bit, 0);
 }
 
 static int pm8607_is_enabled(struct regulator_dev *rdev)
 {
         struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
-        struct pm8607_chip *chip = info->chip;
         int ret;
 
-        ret = pm8607_reg_read(chip, info->enable_reg);
+        ret = pm860x_reg_read(info->i2c, info->enable_reg);
         if (ret < 0)
                 return ret;
 
@@ -589,8 +586,8 @@ static inline struct pm8607_regulator_info *find_regulator_info(int id)
 
 static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
 {
-        struct pm8607_chip *chip = dev_get_drvdata(pdev->dev.parent);
-        struct pm8607_platform_data *pdata = chip->dev->platform_data;
+        struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
+        struct pm860x_platform_data *pdata = chip->dev->platform_data;
         struct pm8607_regulator_info *info = NULL;
 
         info = find_regulator_info(pdev->id);
@@ -599,6 +596,7 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
+        info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
         info->chip = chip;
 
         info->regulator = regulator_register(&info->desc, &pdev->dev,