]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/blobdiff - drivers/mfd/88pm860x-core.c
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[mirror_ubuntu-artful-kernel.git] / drivers / mfd / 88pm860x-core.c
index b73f033b2c602fadce09dd97d0c7623581962e12..8fa86edf70d46ae77d7e47589b6641a3e411ba58 100644 (file)
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/irqdomain.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
 #include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/88pm860x.h>
 #include <linux/regulator/machine.h>
+#include <linux/power/charger-manager.h>
 
 #define INT_STATUS_NUM                 3
 
-static struct resource bk_resources[] __devinitdata = {
-       {PM8606_BACKLIGHT1, PM8606_BACKLIGHT1, "backlight-0", IORESOURCE_IO,},
-       {PM8606_BACKLIGHT2, PM8606_BACKLIGHT2, "backlight-1", IORESOURCE_IO,},
-       {PM8606_BACKLIGHT3, PM8606_BACKLIGHT3, "backlight-2", IORESOURCE_IO,},
-};
-
-static struct resource led_resources[] __devinitdata = {
-       {PM8606_LED1_RED,   PM8606_LED1_RED,   "led0-red",   IORESOURCE_IO,},
-       {PM8606_LED1_GREEN, PM8606_LED1_GREEN, "led0-green", IORESOURCE_IO,},
-       {PM8606_LED1_BLUE,  PM8606_LED1_BLUE,  "led0-blue",  IORESOURCE_IO,},
-       {PM8606_LED2_RED,   PM8606_LED2_RED,   "led1-red",   IORESOURCE_IO,},
-       {PM8606_LED2_GREEN, PM8606_LED2_GREEN, "led1-green", IORESOURCE_IO,},
-       {PM8606_LED2_BLUE,  PM8606_LED2_BLUE,  "led1-blue",  IORESOURCE_IO,},
-};
-
-static struct resource regulator_resources[] __devinitdata = {
-       {PM8607_ID_BUCK1, PM8607_ID_BUCK1, "buck-1", IORESOURCE_IO,},
-       {PM8607_ID_BUCK2, PM8607_ID_BUCK2, "buck-2", IORESOURCE_IO,},
-       {PM8607_ID_BUCK3, PM8607_ID_BUCK3, "buck-3", IORESOURCE_IO,},
-       {PM8607_ID_LDO1,  PM8607_ID_LDO1,  "ldo-01", IORESOURCE_IO,},
-       {PM8607_ID_LDO2,  PM8607_ID_LDO2,  "ldo-02", IORESOURCE_IO,},
-       {PM8607_ID_LDO3,  PM8607_ID_LDO3,  "ldo-03", IORESOURCE_IO,},
-       {PM8607_ID_LDO4,  PM8607_ID_LDO4,  "ldo-04", IORESOURCE_IO,},
-       {PM8607_ID_LDO5,  PM8607_ID_LDO5,  "ldo-05", IORESOURCE_IO,},
-       {PM8607_ID_LDO6,  PM8607_ID_LDO6,  "ldo-06", IORESOURCE_IO,},
-       {PM8607_ID_LDO7,  PM8607_ID_LDO7,  "ldo-07", IORESOURCE_IO,},
-       {PM8607_ID_LDO8,  PM8607_ID_LDO8,  "ldo-08", IORESOURCE_IO,},
-       {PM8607_ID_LDO9,  PM8607_ID_LDO9,  "ldo-09", IORESOURCE_IO,},
-       {PM8607_ID_LDO10, PM8607_ID_LDO10, "ldo-10", IORESOURCE_IO,},
-       {PM8607_ID_LDO11, PM8607_ID_LDO11, "ldo-11", IORESOURCE_IO,},
-       {PM8607_ID_LDO12, PM8607_ID_LDO12, "ldo-12", IORESOURCE_IO,},
-       {PM8607_ID_LDO13, PM8607_ID_LDO13, "ldo-13", IORESOURCE_IO,},
-       {PM8607_ID_LDO14, PM8607_ID_LDO14, "ldo-14", IORESOURCE_IO,},
-       {PM8607_ID_LDO15, PM8607_ID_LDO15, "ldo-15", IORESOURCE_IO,},
+static struct resource bk0_resources[] __devinitdata = {
+       {2, 2, "duty cycle", IORESOURCE_REG, },
+       {3, 3, "always on",  IORESOURCE_REG, },
+       {3, 3, "current",    IORESOURCE_REG, },
+};
+static struct resource bk1_resources[] __devinitdata = {
+       {4, 4, "duty cycle", IORESOURCE_REG, },
+       {5, 5, "always on",  IORESOURCE_REG, },
+       {5, 5, "current",    IORESOURCE_REG, },
+};
+static struct resource bk2_resources[] __devinitdata = {
+       {6, 6, "duty cycle", IORESOURCE_REG, },
+       {7, 7, "always on",  IORESOURCE_REG, },
+       {5, 5, "current",    IORESOURCE_REG, },
+};
+
+static struct resource led0_resources[] __devinitdata = {
+       /* RGB1 Red LED */
+       {0xd, 0xd, "control", IORESOURCE_REG, },
+       {0xc, 0xc, "blink",   IORESOURCE_REG, },
+};
+static struct resource led1_resources[] __devinitdata = {
+       /* RGB1 Green LED */
+       {0xe, 0xe, "control", IORESOURCE_REG, },
+       {0xc, 0xc, "blink",   IORESOURCE_REG, },
+};
+static struct resource led2_resources[] __devinitdata = {
+       /* RGB1 Blue LED */
+       {0xf, 0xf, "control", IORESOURCE_REG, },
+       {0xc, 0xc, "blink",   IORESOURCE_REG, },
+};
+static struct resource led3_resources[] __devinitdata = {
+       /* RGB2 Red LED */
+       {0x9, 0x9, "control", IORESOURCE_REG, },
+       {0x8, 0x8, "blink",   IORESOURCE_REG, },
+};
+static struct resource led4_resources[] __devinitdata = {
+       /* RGB2 Green LED */
+       {0xa, 0xa, "control", IORESOURCE_REG, },
+       {0x8, 0x8, "blink",   IORESOURCE_REG, },
+};
+static struct resource led5_resources[] __devinitdata = {
+       /* RGB2 Blue LED */
+       {0xb, 0xb, "control", IORESOURCE_REG, },
+       {0x8, 0x8, "blink",   IORESOURCE_REG, },
+};
+
+static struct resource buck1_resources[] __devinitdata = {
+       {0x24, 0x24, "buck set", IORESOURCE_REG, },
+};
+static struct resource buck2_resources[] __devinitdata = {
+       {0x25, 0x25, "buck set", IORESOURCE_REG, },
+};
+static struct resource buck3_resources[] __devinitdata = {
+       {0x26, 0x26, "buck set", IORESOURCE_REG, },
+};
+static struct resource ldo1_resources[] __devinitdata = {
+       {0x10, 0x10, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo2_resources[] __devinitdata = {
+       {0x11, 0x11, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo3_resources[] __devinitdata = {
+       {0x12, 0x12, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo4_resources[] __devinitdata = {
+       {0x13, 0x13, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo5_resources[] __devinitdata = {
+       {0x14, 0x14, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo6_resources[] __devinitdata = {
+       {0x15, 0x15, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo7_resources[] __devinitdata = {
+       {0x16, 0x16, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo8_resources[] __devinitdata = {
+       {0x17, 0x17, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo9_resources[] __devinitdata = {
+       {0x18, 0x18, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo10_resources[] __devinitdata = {
+       {0x19, 0x19, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo12_resources[] __devinitdata = {
+       {0x1a, 0x1a, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo_vibrator_resources[] __devinitdata = {
+       {0x28, 0x28, "ldo set", IORESOURCE_REG, },
+};
+static struct resource ldo14_resources[] __devinitdata = {
+       {0x1b, 0x1b, "ldo set", IORESOURCE_REG, },
 };
 
 static struct resource touch_resources[] __devinitdata = {
@@ -84,54 +151,152 @@ static struct resource battery_resources[] __devinitdata = {
 static struct resource charger_resources[] __devinitdata = {
        {PM8607_IRQ_CHG,  PM8607_IRQ_CHG,  "charger detect",  IORESOURCE_IRQ,},
        {PM8607_IRQ_CHG_DONE,  PM8607_IRQ_CHG_DONE,  "charging done",       IORESOURCE_IRQ,},
-       {PM8607_IRQ_CHG_FAULT, PM8607_IRQ_CHG_FAULT, "charging timeout",    IORESOURCE_IRQ,},
+       {PM8607_IRQ_CHG_FAIL,  PM8607_IRQ_CHG_FAIL,  "charging timeout",    IORESOURCE_IRQ,},
+       {PM8607_IRQ_CHG_FAULT, PM8607_IRQ_CHG_FAULT, "charging fault",      IORESOURCE_IRQ,},
        {PM8607_IRQ_GPADC1,    PM8607_IRQ_GPADC1,    "battery temperature", IORESOURCE_IRQ,},
        {PM8607_IRQ_VBAT, PM8607_IRQ_VBAT, "battery voltage", IORESOURCE_IRQ,},
        {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage",    IORESOURCE_IRQ,},
 };
 
-static struct resource preg_resources[] __devinitdata = {
-       {PM8606_ID_PREG,  PM8606_ID_PREG,  "preg",   IORESOURCE_IO,},
-};
-
 static struct resource rtc_resources[] __devinitdata = {
        {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},
 };
 
-static struct mfd_cell bk_devs[] = {
-       {"88pm860x-backlight", 0,},
-       {"88pm860x-backlight", 1,},
-       {"88pm860x-backlight", 2,},
-};
-
-static struct mfd_cell led_devs[] = {
-       {"88pm860x-led", 0,},
-       {"88pm860x-led", 1,},
-       {"88pm860x-led", 2,},
-       {"88pm860x-led", 3,},
-       {"88pm860x-led", 4,},
-       {"88pm860x-led", 5,},
-};
-
-static struct mfd_cell regulator_devs[] = {
-       {"88pm860x-regulator", 0,},
-       {"88pm860x-regulator", 1,},
-       {"88pm860x-regulator", 2,},
-       {"88pm860x-regulator", 3,},
-       {"88pm860x-regulator", 4,},
-       {"88pm860x-regulator", 5,},
-       {"88pm860x-regulator", 6,},
-       {"88pm860x-regulator", 7,},
-       {"88pm860x-regulator", 8,},
-       {"88pm860x-regulator", 9,},
-       {"88pm860x-regulator", 10,},
-       {"88pm860x-regulator", 11,},
-       {"88pm860x-regulator", 12,},
-       {"88pm860x-regulator", 13,},
-       {"88pm860x-regulator", 14,},
-       {"88pm860x-regulator", 15,},
-       {"88pm860x-regulator", 16,},
-       {"88pm860x-regulator", 17,},
+static struct mfd_cell bk_devs[] __devinitdata = {
+       {
+               .name = "88pm860x-backlight",
+               .id = 0,
+               .num_resources = ARRAY_SIZE(bk0_resources),
+               .resources = bk0_resources,
+       }, {
+               .name = "88pm860x-backlight",
+               .id = 1,
+               .num_resources = ARRAY_SIZE(bk1_resources),
+               .resources = bk1_resources,
+       }, {
+               .name = "88pm860x-backlight",
+               .id = 2,
+               .num_resources = ARRAY_SIZE(bk2_resources),
+               .resources = bk2_resources,
+       },
+};
+
+static struct mfd_cell led_devs[] __devinitdata = {
+       {
+               .name = "88pm860x-led",
+               .id = 0,
+               .num_resources = ARRAY_SIZE(led0_resources),
+               .resources = led0_resources,
+       }, {
+               .name = "88pm860x-led",
+               .id = 1,
+               .num_resources = ARRAY_SIZE(led1_resources),
+               .resources = led1_resources,
+       }, {
+               .name = "88pm860x-led",
+               .id = 2,
+               .num_resources = ARRAY_SIZE(led2_resources),
+               .resources = led2_resources,
+       }, {
+               .name = "88pm860x-led",
+               .id = 3,
+               .num_resources = ARRAY_SIZE(led3_resources),
+               .resources = led3_resources,
+       }, {
+               .name = "88pm860x-led",
+               .id = 4,
+               .num_resources = ARRAY_SIZE(led4_resources),
+               .resources = led4_resources,
+       }, {
+               .name = "88pm860x-led",
+               .id = 5,
+               .num_resources = ARRAY_SIZE(led5_resources),
+               .resources = led5_resources,
+       },
+};
+
+static struct mfd_cell reg_devs[] __devinitdata = {
+       {
+               .name = "88pm860x-regulator",
+               .id = 0,
+               .num_resources = ARRAY_SIZE(buck1_resources),
+               .resources = buck1_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 1,
+               .num_resources = ARRAY_SIZE(buck2_resources),
+               .resources = buck2_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 2,
+               .num_resources = ARRAY_SIZE(buck3_resources),
+               .resources = buck3_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 3,
+               .num_resources = ARRAY_SIZE(ldo1_resources),
+               .resources = ldo1_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 4,
+               .num_resources = ARRAY_SIZE(ldo2_resources),
+               .resources = ldo2_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 5,
+               .num_resources = ARRAY_SIZE(ldo3_resources),
+               .resources = ldo3_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 6,
+               .num_resources = ARRAY_SIZE(ldo4_resources),
+               .resources = ldo4_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 7,
+               .num_resources = ARRAY_SIZE(ldo5_resources),
+               .resources = ldo5_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 8,
+               .num_resources = ARRAY_SIZE(ldo6_resources),
+               .resources = ldo6_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 9,
+               .num_resources = ARRAY_SIZE(ldo7_resources),
+               .resources = ldo7_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 10,
+               .num_resources = ARRAY_SIZE(ldo8_resources),
+               .resources = ldo8_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 11,
+               .num_resources = ARRAY_SIZE(ldo9_resources),
+               .resources = ldo9_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 12,
+               .num_resources = ARRAY_SIZE(ldo10_resources),
+               .resources = ldo10_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 13,
+               .num_resources = ARRAY_SIZE(ldo12_resources),
+               .resources = ldo12_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 14,
+               .num_resources = ARRAY_SIZE(ldo_vibrator_resources),
+               .resources = ldo_vibrator_resources,
+       }, {
+               .name = "88pm860x-regulator",
+               .id = 15,
+               .num_resources = ARRAY_SIZE(ldo14_resources),
+               .resources = ldo14_resources,
+       },
 };
 
 static struct mfd_cell touch_devs[] = {
@@ -155,10 +320,15 @@ static struct regulator_init_data preg_init_data = {
        .consumer_supplies      = &preg_supply[0],
 };
 
+static struct charger_regulator chg_desc_regulator_data[] = {
+       { .regulator_name = "preg", },
+};
+
 static struct mfd_cell power_devs[] = {
        {"88pm860x-battery", -1,},
        {"88pm860x-charger", -1,},
        {"88pm860x-preg",    -1,},
+       {"charger-manager", -1,},
 };
 
 static struct mfd_cell rtc_devs[] = {
@@ -360,15 +530,12 @@ static void pm860x_irq_sync_unlock(struct irq_data *data)
 
 static void pm860x_irq_enable(struct irq_data *data)
 {
-       struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
-       pm860x_irqs[data->irq - chip->irq_base].enable
-               = pm860x_irqs[data->irq - chip->irq_base].offs;
+       pm860x_irqs[data->hwirq].enable = pm860x_irqs[data->hwirq].offs;
 }
 
 static void pm860x_irq_disable(struct irq_data *data)
 {
-       struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
-       pm860x_irqs[data->irq - chip->irq_base].enable = 0;
+       pm860x_irqs[data->hwirq].enable = 0;
 }
 
 static struct irq_chip pm860x_irq_chip = {
@@ -379,53 +546,25 @@ static struct irq_chip pm860x_irq_chip = {
        .irq_disable    = pm860x_irq_disable,
 };
 
-static int __devinit device_gpadc_init(struct pm860x_chip *chip,
-                                      struct pm860x_platform_data *pdata)
+static int pm860x_irq_domain_map(struct irq_domain *d, unsigned int virq,
+                                irq_hw_number_t hw)
 {
-       struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \
-                               : chip->companion;
-       int data;
-       int ret;
-
-       /* initialize GPADC without activating it */
-
-       if (!pdata || !pdata->touch)
-               return -EINVAL;
-
-       /* set GPADC MISC1 register */
-       data = 0;
-       data |= (pdata->touch->gpadc_prebias << 1) & PM8607_GPADC_PREBIAS_MASK;
-       data |= (pdata->touch->slot_cycle << 3) & PM8607_GPADC_SLOT_CYCLE_MASK;
-       data |= (pdata->touch->off_scale << 5) & PM8607_GPADC_OFF_SCALE_MASK;
-       data |= (pdata->touch->sw_cal << 7) & PM8607_GPADC_SW_CAL_MASK;
-       if (data) {
-               ret = pm860x_reg_write(i2c, PM8607_GPADC_MISC1, data);
-               if (ret < 0)
-                       goto out;
-       }
-       /* set tsi prebias time */
-       if (pdata->touch->tsi_prebias) {
-               data = pdata->touch->tsi_prebias;
-               ret = pm860x_reg_write(i2c, PM8607_TSI_PREBIAS, data);
-               if (ret < 0)
-                       goto out;
-       }
-       /* set prebias & prechg time of pen detect */
-       data = 0;
-       data |= pdata->touch->pen_prebias & PM8607_PD_PREBIAS_MASK;
-       data |= (pdata->touch->pen_prechg << 5) & PM8607_PD_PRECHG_MASK;
-       if (data) {
-               ret = pm860x_reg_write(i2c, PM8607_PD_PREBIAS, data);
-               if (ret < 0)
-                       goto out;
-       }
-
-       ret = pm860x_set_bits(i2c, PM8607_GPADC_MISC1,
-                             PM8607_GPADC_EN, PM8607_GPADC_EN);
-out:
-       return ret;
+       irq_set_chip_data(virq, d->host_data);
+       irq_set_chip_and_handler(virq, &pm860x_irq_chip, handle_edge_irq);
+       irq_set_nested_thread(virq, 1);
+#ifdef CONFIG_ARM
+       set_irq_flags(virq, IRQF_VALID);
+#else
+       irq_set_noprobe(virq);
+#endif
+       return 0;
 }
 
+static struct irq_domain_ops pm860x_irq_domain_ops = {
+       .map    = pm860x_irq_domain_map,
+       .xlate  = irq_domain_xlate_onetwocell,
+};
+
 static int __devinit device_irq_init(struct pm860x_chip *chip,
                                     struct pm860x_platform_data *pdata)
 {
@@ -433,13 +572,9 @@ static int __devinit device_irq_init(struct pm860x_chip *chip,
                                : chip->companion;
        unsigned char status_buf[INT_STATUS_NUM];
        unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
-       int i, data, mask, ret = -EINVAL;
-       int __irq;
-
-       if (!pdata || !pdata->irq_base) {
-               dev_warn(chip->dev, "No interrupt support on IRQ base\n");
-               return -EINVAL;
-       }
+       int data, mask, ret = -EINVAL;
+       int nr_irqs, irq_base = -1;
+       struct device_node *node = i2c->dev.of_node;
 
        mask = PM8607_B0_MISC1_INV_INT | PM8607_B0_MISC1_INT_CLEAR
                | PM8607_B0_MISC1_INT_MASK;
@@ -479,26 +614,24 @@ static int __devinit device_irq_init(struct pm860x_chip *chip,
                goto out;
 
        mutex_init(&chip->irq_lock);
-       chip->irq_base = pdata->irq_base;
+
+       if (pdata && pdata->irq_base)
+               irq_base = pdata->irq_base;
+       nr_irqs = ARRAY_SIZE(pm860x_irqs);
+       chip->irq_base = irq_alloc_descs(irq_base, 0, nr_irqs, 0);
+       if (chip->irq_base < 0) {
+               dev_err(&i2c->dev, "Failed to allocate interrupts, ret:%d\n",
+                       chip->irq_base);
+               ret = -EBUSY;
+               goto out;
+       }
+       irq_domain_add_legacy(node, nr_irqs, chip->irq_base, 0,
+                             &pm860x_irq_domain_ops, chip);
        chip->core_irq = i2c->irq;
        if (!chip->core_irq)
                goto out;
 
-       /* register IRQ by genirq */
-       for (i = 0; i < ARRAY_SIZE(pm860x_irqs); i++) {
-               __irq = i + chip->irq_base;
-               irq_set_chip_data(__irq, chip);
-               irq_set_chip_and_handler(__irq, &pm860x_irq_chip,
-                                        handle_edge_irq);
-               irq_set_nested_thread(__irq, 1);
-#ifdef CONFIG_ARM
-               set_irq_flags(__irq, IRQF_VALID);
-#else
-               irq_set_noprobe(__irq);
-#endif
-       }
-
-       ret = request_threaded_irq(chip->core_irq, NULL, pm860x_irq, flags,
+       ret = request_threaded_irq(chip->core_irq, NULL, pm860x_irq, flags | IRQF_ONESHOT,
                                   "88pm860x", chip);
        if (ret) {
                dev_err(chip->dev, "Failed to request IRQ: %d\n", ret);
@@ -615,108 +748,122 @@ static void __devinit device_osc_init(struct i2c_client *i2c)
 static void __devinit device_bk_init(struct pm860x_chip *chip,
                                     struct pm860x_platform_data *pdata)
 {
-       int ret;
-       int i, j, id;
-
-       if ((pdata == NULL) || (pdata->backlight == NULL))
-               return;
-
-       if (pdata->num_backlights > ARRAY_SIZE(bk_devs))
-               pdata->num_backlights = ARRAY_SIZE(bk_devs);
-
-       for (i = 0; i < pdata->num_backlights; i++) {
-               bk_devs[i].platform_data = &pdata->backlight[i];
-               bk_devs[i].pdata_size = sizeof(struct pm860x_backlight_pdata);
-
-               for (j = 0; j < ARRAY_SIZE(bk_devs); j++) {
-                       id = bk_resources[j].start;
-                       if (pdata->backlight[i].flags != id)
-                               continue;
-
-                       bk_devs[i].num_resources = 1;
-                       bk_devs[i].resources = &bk_resources[j];
-                       ret = mfd_add_devices(chip->dev, 0,
-                                             &bk_devs[i], 1,
-                                             &bk_resources[j], 0, NULL);
-                       if (ret < 0) {
-                               dev_err(chip->dev, "Failed to add "
-                                       "backlight subdev\n");
-                               return;
-                       }
+       int ret, i;
+
+       if (pdata && pdata->backlight) {
+               if (pdata->num_backlights > ARRAY_SIZE(bk_devs))
+                       pdata->num_backlights = ARRAY_SIZE(bk_devs);
+               for (i = 0; i < pdata->num_backlights; i++) {
+                       bk_devs[i].platform_data = &pdata->backlight[i];
+                       bk_devs[i].pdata_size =
+                               sizeof(struct pm860x_backlight_pdata);
                }
        }
+       ret = mfd_add_devices(chip->dev, 0, bk_devs,
+                             ARRAY_SIZE(bk_devs), NULL, 0, NULL);
+       if (ret < 0)
+               dev_err(chip->dev, "Failed to add backlight subdev\n");
 }
 
 static void __devinit device_led_init(struct pm860x_chip *chip,
                                      struct pm860x_platform_data *pdata)
 {
-       int ret;
-       int i, j, id;
-
-       if ((pdata == NULL) || (pdata->led == NULL))
-               return;
-
-       if (pdata->num_leds > ARRAY_SIZE(led_devs))
-               pdata->num_leds = ARRAY_SIZE(led_devs);
-
-       for (i = 0; i < pdata->num_leds; i++) {
-               led_devs[i].platform_data = &pdata->led[i];
-               led_devs[i].pdata_size = sizeof(struct pm860x_led_pdata);
-
-               for (j = 0; j < ARRAY_SIZE(led_devs); j++) {
-                       id = led_resources[j].start;
-                       if (pdata->led[i].flags != id)
-                               continue;
-
-                       led_devs[i].num_resources = 1;
-                       led_devs[i].resources = &led_resources[j],
-                       ret = mfd_add_devices(chip->dev, 0,
-                                             &led_devs[i], 1,
-                                             &led_resources[j], 0, NULL);
-                       if (ret < 0) {
-                               dev_err(chip->dev, "Failed to add "
-                                       "led subdev\n");
-                               return;
-                       }
+       int ret, i;
+
+       if (pdata && pdata->led) {
+               if (pdata->num_leds > ARRAY_SIZE(led_devs))
+                       pdata->num_leds = ARRAY_SIZE(led_devs);
+               for (i = 0; i < pdata->num_leds; i++) {
+                       led_devs[i].platform_data = &pdata->led[i];
+                       led_devs[i].pdata_size =
+                               sizeof(struct pm860x_led_pdata);
                }
        }
+       ret = mfd_add_devices(chip->dev, 0, led_devs,
+                             ARRAY_SIZE(led_devs), NULL, 0, NULL);
+       if (ret < 0) {
+               dev_err(chip->dev, "Failed to add led subdev\n");
+               return;
+       }
 }
 
 static void __devinit device_regulator_init(struct pm860x_chip *chip,
                                            struct pm860x_platform_data *pdata)
 {
-       struct regulator_init_data *initdata;
        int ret;
-       int i, seq;
 
-       if ((pdata == NULL) || (pdata->regulator == NULL))
+       if (pdata == NULL)
+               return;
+       if (pdata->buck1) {
+               reg_devs[0].platform_data = pdata->buck1;
+               reg_devs[0].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->buck2) {
+               reg_devs[1].platform_data = pdata->buck2;
+               reg_devs[1].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->buck3) {
+               reg_devs[2].platform_data = pdata->buck3;
+               reg_devs[2].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo1) {
+               reg_devs[3].platform_data = pdata->ldo1;
+               reg_devs[3].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo2) {
+               reg_devs[4].platform_data = pdata->ldo2;
+               reg_devs[4].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo3) {
+               reg_devs[5].platform_data = pdata->ldo3;
+               reg_devs[5].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo4) {
+               reg_devs[6].platform_data = pdata->ldo4;
+               reg_devs[6].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo5) {
+               reg_devs[7].platform_data = pdata->ldo5;
+               reg_devs[7].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo6) {
+               reg_devs[8].platform_data = pdata->ldo6;
+               reg_devs[8].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo7) {
+               reg_devs[9].platform_data = pdata->ldo7;
+               reg_devs[9].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo8) {
+               reg_devs[10].platform_data = pdata->ldo8;
+               reg_devs[10].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo9) {
+               reg_devs[11].platform_data = pdata->ldo9;
+               reg_devs[11].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo10) {
+               reg_devs[12].platform_data = pdata->ldo10;
+               reg_devs[12].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo12) {
+               reg_devs[13].platform_data = pdata->ldo12;
+               reg_devs[13].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo_vibrator) {
+               reg_devs[14].platform_data = pdata->ldo_vibrator;
+               reg_devs[14].pdata_size = sizeof(struct regulator_init_data);
+       }
+       if (pdata->ldo14) {
+               reg_devs[15].platform_data = pdata->ldo14;
+               reg_devs[15].pdata_size = sizeof(struct regulator_init_data);
+       }
+       ret = mfd_add_devices(chip->dev, 0, reg_devs,
+                             ARRAY_SIZE(reg_devs), NULL, 0, NULL);
+       if (ret < 0) {
+               dev_err(chip->dev, "Failed to add regulator subdev\n");
                return;
-
-       if (pdata->num_regulators > ARRAY_SIZE(regulator_devs))
-               pdata->num_regulators = ARRAY_SIZE(regulator_devs);
-
-       for (i = 0, seq = -1; i < pdata->num_regulators; i++) {
-               initdata = &pdata->regulator[i];
-               seq = *(unsigned int *)initdata->driver_data;
-               if ((seq < 0) || (seq > PM8607_ID_RG_MAX)) {
-                       dev_err(chip->dev, "Wrong ID(%d) on regulator(%s)\n",
-                               seq, initdata->constraints.name);
-                       goto out;
-               }
-               regulator_devs[i].platform_data = &pdata->regulator[i];
-               regulator_devs[i].pdata_size = sizeof(struct regulator_init_data);
-               regulator_devs[i].num_resources = 1;
-               regulator_devs[i].resources = &regulator_resources[seq];
-
-               ret = mfd_add_devices(chip->dev, 0, &regulator_devs[i], 1,
-                                     &regulator_resources[seq], 0, NULL);
-               if (ret < 0) {
-                       dev_err(chip->dev, "Failed to add regulator subdev\n");
-                       goto out;
-               }
        }
-out:
-       return;
 }
 
 static void __devinit device_rtc_init(struct pm860x_chip *chip,
@@ -785,12 +932,23 @@ static void __devinit device_power_init(struct pm860x_chip *chip,
 
        power_devs[2].platform_data = &preg_init_data;
        power_devs[2].pdata_size = sizeof(struct regulator_init_data);
-       power_devs[2].num_resources = ARRAY_SIZE(preg_resources);
-       power_devs[2].resources = &preg_resources[0],
        ret = mfd_add_devices(chip->dev, 0, &power_devs[2], 1,
-                             &preg_resources[0], chip->irq_base, NULL);
+                             NULL, chip->irq_base, NULL);
        if (ret < 0)
                dev_err(chip->dev, "Failed to add preg subdev\n");
+
+       if (pdata->chg_desc) {
+               pdata->chg_desc->charger_regulators =
+                       &chg_desc_regulator_data[0];
+               pdata->chg_desc->num_charger_regulators =
+                       ARRAY_SIZE(chg_desc_regulator_data),
+               power_devs[3].platform_data = pdata->chg_desc;
+               power_devs[3].pdata_size = sizeof(*pdata->chg_desc);
+               ret = mfd_add_devices(chip->dev, 0, &power_devs[3], 1,
+                                     NULL, chip->irq_base, NULL);
+               if (ret < 0)
+                       dev_err(chip->dev, "Failed to add chg-manager subdev\n");
+       }
 }
 
 static void __devinit device_onkey_init(struct pm860x_chip *chip,
@@ -868,10 +1026,6 @@ static void __devinit device_8607_init(struct pm860x_chip *chip,
                goto out;
        }
 
-       ret = device_gpadc_init(chip, pdata);
-       if (ret < 0)
-               goto out;
-
        ret = device_irq_init(chip, pdata);
        if (ret < 0)
                goto out;
@@ -895,8 +1049,8 @@ static void __devinit device_8606_init(struct pm860x_chip *chip,
        device_led_init(chip, pdata);
 }
 
-int __devinit pm860x_device_init(struct pm860x_chip *chip,
-                      struct pm860x_platform_data *pdata)
+static int __devinit pm860x_device_init(struct pm860x_chip *chip,
+                                       struct pm860x_platform_data *pdata)
 {
        chip->core_irq = 0;
 
@@ -923,12 +1077,207 @@ int __devinit pm860x_device_init(struct pm860x_chip *chip,
        return 0;
 }
 
-void __devexit pm860x_device_exit(struct pm860x_chip *chip)
+static void __devexit pm860x_device_exit(struct pm860x_chip *chip)
 {
        device_irq_exit(chip);
        mfd_remove_devices(chip->dev);
 }
 
+static int verify_addr(struct i2c_client *i2c)
+{
+       unsigned short addr_8607[] = {0x30, 0x34};
+       unsigned short addr_8606[] = {0x10, 0x11};
+       int size, i;
+
+       if (i2c == NULL)
+               return 0;
+       size = ARRAY_SIZE(addr_8606);
+       for (i = 0; i < size; i++) {
+               if (i2c->addr == *(addr_8606 + i))
+                       return CHIP_PM8606;
+       }
+       size = ARRAY_SIZE(addr_8607);
+       for (i = 0; i < size; i++) {
+               if (i2c->addr == *(addr_8607 + i))
+                       return CHIP_PM8607;
+       }
+       return 0;
+}
+
+static struct regmap_config pm860x_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+};
+
+static int __devinit pm860x_dt_init(struct device_node *np,
+                                   struct device *dev,
+                                   struct pm860x_platform_data *pdata)
+{
+       int ret;
+
+       if (of_get_property(np, "marvell,88pm860x-irq-read-clr", NULL))
+               pdata->irq_mode = 1;
+       ret = of_property_read_u32(np, "marvell,88pm860x-slave-addr",
+                                  &pdata->companion_addr);
+       if (ret) {
+               dev_err(dev, "Not found \"marvell,88pm860x-slave-addr\" "
+                       "property\n");
+               pdata->companion_addr = 0;
+       }
+       return 0;
+}
+
+static int __devinit pm860x_probe(struct i2c_client *client,
+                                 const struct i2c_device_id *id)
+{
+       struct pm860x_platform_data *pdata = client->dev.platform_data;
+       struct device_node *node = client->dev.of_node;
+       struct pm860x_chip *chip;
+       int ret;
+
+       if (node && !pdata) {
+               /* parse DT to get platform data */
+               pdata = devm_kzalloc(&client->dev,
+                                    sizeof(struct pm860x_platform_data),
+                                    GFP_KERNEL);
+               if (!pdata)
+                       return -ENOMEM;
+               ret = pm860x_dt_init(node, &client->dev, pdata);
+               if (ret)
+                       goto err;
+       } else if (!pdata) {
+               pr_info("No platform data in %s!\n", __func__);
+               return -EINVAL;
+       }
+
+       chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL);
+       if (chip == NULL) {
+               ret = -ENOMEM;
+               goto err;
+       }
+
+       chip->id = verify_addr(client);
+       chip->regmap = regmap_init_i2c(client, &pm860x_regmap_config);
+       if (IS_ERR(chip->regmap)) {
+               ret = PTR_ERR(chip->regmap);
+               dev_err(&client->dev, "Failed to allocate register map: %d\n",
+                               ret);
+               kfree(chip);
+               return ret;
+       }
+       chip->client = client;
+       i2c_set_clientdata(client, chip);
+       chip->dev = &client->dev;
+       dev_set_drvdata(chip->dev, chip);
+
+       /*
+        * Both client and companion client shares same platform driver.
+        * Driver distinguishes them by pdata->companion_addr.
+        * pdata->companion_addr is only assigned if companion chip exists.
+        * At the same time, the companion_addr shouldn't equal to client
+        * address.
+        */
+       if (pdata->companion_addr && (pdata->companion_addr != client->addr)) {
+               chip->companion_addr = pdata->companion_addr;
+               chip->companion = i2c_new_dummy(chip->client->adapter,
+                                               chip->companion_addr);
+               chip->regmap_companion = regmap_init_i2c(chip->companion,
+                                                       &pm860x_regmap_config);
+               if (IS_ERR(chip->regmap_companion)) {
+                       ret = PTR_ERR(chip->regmap_companion);
+                       dev_err(&chip->companion->dev,
+                               "Failed to allocate register map: %d\n", ret);
+                       return ret;
+               }
+               i2c_set_clientdata(chip->companion, chip);
+       }
+
+       pm860x_device_init(chip, pdata);
+       return 0;
+err:
+       if (node)
+               devm_kfree(&client->dev, pdata);
+       return ret;
+}
+
+static int __devexit pm860x_remove(struct i2c_client *client)
+{
+       struct pm860x_chip *chip = i2c_get_clientdata(client);
+
+       pm860x_device_exit(chip);
+       if (chip->companion) {
+               regmap_exit(chip->regmap_companion);
+               i2c_unregister_device(chip->companion);
+       }
+       regmap_exit(chip->regmap);
+       kfree(chip);
+       return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int pm860x_suspend(struct device *dev)
+{
+       struct i2c_client *client = container_of(dev, struct i2c_client, dev);
+       struct pm860x_chip *chip = i2c_get_clientdata(client);
+
+       if (device_may_wakeup(dev) && chip->wakeup_flag)
+               enable_irq_wake(chip->core_irq);
+       return 0;
+}
+
+static int pm860x_resume(struct device *dev)
+{
+       struct i2c_client *client = container_of(dev, struct i2c_client, dev);
+       struct pm860x_chip *chip = i2c_get_clientdata(client);
+
+       if (device_may_wakeup(dev) && chip->wakeup_flag)
+               disable_irq_wake(chip->core_irq);
+       return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume);
+
+static const struct i2c_device_id pm860x_id_table[] = {
+       { "88PM860x", 0 },
+       {}
+};
+MODULE_DEVICE_TABLE(i2c, pm860x_id_table);
+
+static const struct of_device_id pm860x_dt_ids[] = {
+       { .compatible = "marvell,88pm860x", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, pm860x_dt_ids);
+
+static struct i2c_driver pm860x_driver = {
+       .driver = {
+               .name   = "88PM860x",
+               .owner  = THIS_MODULE,
+               .pm     = &pm860x_pm_ops,
+               .of_match_table = of_match_ptr(pm860x_dt_ids),
+       },
+       .probe          = pm860x_probe,
+       .remove         = __devexit_p(pm860x_remove),
+       .id_table       = pm860x_id_table,
+};
+
+static int __init pm860x_i2c_init(void)
+{
+       int ret;
+       ret = i2c_add_driver(&pm860x_driver);
+       if (ret != 0)
+               pr_err("Failed to register 88PM860x I2C driver: %d\n", ret);
+       return ret;
+}
+subsys_initcall(pm860x_i2c_init);
+
+static void __exit pm860x_i2c_exit(void)
+{
+       i2c_del_driver(&pm860x_driver);
+}
+module_exit(pm860x_i2c_exit);
+
 MODULE_DESCRIPTION("PMIC Driver for Marvell 88PM860x");
 MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
 MODULE_LICENSE("GPL");