twl4030_charger: Allow charger to control the regulator that feeds it

The charger needs usb3v1 to be running, so add a new consumer to
keep it running.

This allows the charger to draw current even when the USB driver has
powered down.

Signed-off-by: NeilBrown <neilb@suse.de>
Acked-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 6fc90befa79..269b296a097 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -716,8 +716,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                 static struct regulator_consumer_supply usb1v8 = {
                         .supply =       "usb1v8",
                 };
-                static struct regulator_consumer_supply usb3v1 = {
-                        .supply =       "usb3v1",
+                static struct regulator_consumer_supply usb3v1[] = {
+                        { .supply =     "usb3v1" },
+                        { .supply =     "bci3v1" },
                 };
 
         /* First add the regulators so that they can be used by transceiver */
@@ -745,7 +746,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                                 return PTR_ERR(child);
 
                         child = add_regulator_linked(TWL4030_REG_VUSB3V1,
-                                                      &usb_fixed, &usb3v1, 1,
+                                                      &usb_fixed, usb3v1, 2,
                                                       features);
                         if (IS_ERR(child))
                                 return PTR_ERR(child);
@@ -766,7 +767,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                 if (twl_has_regulator() && child) {
                         usb1v5.dev_name = dev_name(child);
                         usb1v8.dev_name = dev_name(child);
-                        usb3v1.dev_name = dev_name(child);
+                        usb3v1[0].dev_name = dev_name(child);
                 }
         }
         if (twl_has_usb() && pdata->usb && twl_class_is_6030()) {