Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / mfd / twl-core.c

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 35275ba7096fdcbf941c400e017f8e29f1f7565e..a35fa7dcbf53b6778696aa81d5a82a3d145ab148 100644 (file)
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -95,7 +95,8 @@
 #define twl_has_rtc()  false
 #endif
 
-#if defined(CONFIG_TWL4030_USB) || defined(CONFIG_TWL4030_USB_MODULE)
+#if defined(CONFIG_TWL4030_USB) || defined(CONFIG_TWL4030_USB_MODULE) ||\
+       defined(CONFIG_TWL6030_USB) || defined(CONFIG_TWL6030_USB_MODULE)
 #define twl_has_usb()  true
 #else
 #define twl_has_usb()  false
@@ -682,6 +683,43 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
                        usb3v1.dev = child;
                }
        }
+       if (twl_has_usb() && pdata->usb && twl_class_is_6030()) {
+
+               static struct regulator_consumer_supply usb3v3 = {
+                       .supply =       "vusb",
+               };
+
+               if (twl_has_regulator()) {
+                       /* this is a template that gets copied */
+                       struct regulator_init_data usb_fixed = {
+                               .constraints.valid_modes_mask =
+                                       REGULATOR_MODE_NORMAL
+                                       | REGULATOR_MODE_STANDBY,
+                               .constraints.valid_ops_mask =
+                                       REGULATOR_CHANGE_MODE
+                                       | REGULATOR_CHANGE_STATUS,
+                       };
+
+                       child = add_regulator_linked(TWL6030_REG_VUSB,
+                                                     &usb_fixed, &usb3v3, 1);
+                       if (IS_ERR(child))
+                               return PTR_ERR(child);
+               }
+
+               child = add_child(0, "twl6030_usb",
+                       pdata->usb, sizeof(*pdata->usb),
+                       true,
+                       /* irq1 = VBUS_PRES, irq0 = USB ID */
+                       pdata->irq_base + USBOTG_INTR_OFFSET,
+                       pdata->irq_base + USB_PRES_INTR_OFFSET);
+
+               if (IS_ERR(child))
+                       return PTR_ERR(child);
+               /* we need to connect regulators to this transceiver */
+               if (twl_has_regulator() && child)
+                       usb3v3.dev = child;
+
+       }
 
        if (twl_has_watchdog()) {
                child = add_child(0, "twl4030_wdt", NULL, 0, false, 0, 0);
@@ -815,10 +853,6 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
                if (IS_ERR(child))
                        return PTR_ERR(child);
 
-               child = add_regulator(TWL6030_REG_VUSB, pdata->vusb);
-               if (IS_ERR(child))
-                       return PTR_ERR(child);
-
                child = add_regulator(TWL6030_REG_VAUX1_6030, pdata->vaux1);
                if (IS_ERR(child))
                        return PTR_ERR(child);
@@ -969,7 +1003,7 @@ static int twl_remove(struct i2c_client *client)
 }
 
 /* NOTE:  this driver only handles a single twl4030/tps659x0 chip */
-static int __init
+static int __devinit
 twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
        int                             status;