These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mfd / twl-core.c

diff --git a/kernel/drivers/mfd/twl-core.c b/kernel/drivers/mfd/twl-core.c
index 489674a..831696e 100644 (file)
--- a/kernel/drivers/mfd/twl-core.c
+++ b/kernel/drivers/mfd/twl-core.c
@@ -788,9 +788,8 @@ 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" },
-                       { .supply =     "bci3v1" },
+               static struct regulator_consumer_supply usb3v1 = {
+                       .supply =       "usb3v1",
                };
 
        /* First add the regulators so that they can be used by transceiver */
@@ -818,7 +817,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, 2,
+                                                     &usb_fixed, &usb3v1, 1,
                                                      features);
                        if (IS_ERR(child))
                                return PTR_ERR(child);
@@ -838,7 +837,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && child) {
                        usb1v5.dev_name = dev_name(child);
                        usb1v8.dev_name = dev_name(child);
-                       usb3v1[0].dev_name = dev_name(child);
+                       usb3v1.dev_name = dev_name(child);
                }
        }