diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 02:38:50 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 02:38:50 -0400 |
| commit | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (patch) | |
| tree | 722948059bbd325bbca232269490124231df80d4 /include/linux/i2c/twl.h | |
| parent | 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 (diff) | |
| parent | def179c271ac9b5020deca798470521f14d11edd (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/i2c/twl.h')
| -rw-r--r-- | include/linux/i2c/twl.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index c760991b354a..61b9609e55f2 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -593,6 +593,13 @@ enum twl4030_usb_mode { | |||
| 593 | 593 | ||
| 594 | struct twl4030_usb_data { | 594 | struct twl4030_usb_data { |
| 595 | enum twl4030_usb_mode usb_mode; | 595 | enum twl4030_usb_mode usb_mode; |
| 596 | |||
| 597 | int (*phy_init)(struct device *dev); | ||
| 598 | int (*phy_exit)(struct device *dev); | ||
| 599 | /* Power on/off the PHY */ | ||
| 600 | int (*phy_power)(struct device *dev, int iD, int on); | ||
| 601 | /* enable/disable phy clocks */ | ||
| 602 | int (*phy_set_clock)(struct device *dev, int on); | ||
| 596 | }; | 603 | }; |
| 597 | 604 | ||
| 598 | struct twl4030_ins { | 605 | struct twl4030_ins { |