Triton BCI driver for OMAP3430 - USB changes

This patch calls the functionality supported by the TWL4030 battery charger
interface driver
to enable/disable battery charging upon cable attach/detach.

Signed-off-by: Madhusudhan Chikkature<madhu.cr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/i2c/chips/twl4030-usb.c b/drivers/i2c/chips/twl4030-usb.c
index 20858b5bf784f31f6af7bf116968bd6c83207869..d9760e41631fc7cf80a6514ee40bc910fed5778d 100644 (file)
--- a/drivers/i2c/chips/twl4030-usb.c
+++ b/drivers/i2c/chips/twl4030-usb.c
@@ -601,10 +601,13 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
                goto done;
        }
 
-       if (val & USB_PRES_RISING)
+       if (val & USB_PRES_RISING) {
                twl4030_phy_resume();
-       else
+               twl4030charger_usb_en(1);
+       } else {
+               twl4030charger_usb_en(0);
                twl4030_phy_suspend(0);
+       }
 
        ret = IRQ_HANDLED;
 

diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index 40af46e181e911c13dbf51575bc840fe8f2c81cf..b141cc73c23b7796beebf1b27866307199f0c301 100644 (file)
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -127,4 +127,11 @@ int twl4030_set_gpio_edge_ctrl(int gpio, int edge);
 int twl4030_set_gpio_debounce(int gpio, int enable);
 int twl4030_free_gpio(int gpio);
 
+#if defined(CONFIG_TWL4030_BCI_BATTERY) || \
+       defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)
+       extern int twl4030charger_usb_en(int enable);
+#else
+       static inline int twl4030charger_usb_en(int enable) { return 0; }
+#endif
+
 #endif /* End of __TWL4030_H */