diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
| commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
| tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /arch/arm/plat-omap/include/plat/usb.h | |
| parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
| parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) | |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'arch/arm/plat-omap/include/plat/usb.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/usb.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index 59c7fe731f2..450a332f100 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/arch/arm/plat-omap/include/plat/usb.h | |||
| @@ -11,6 +11,7 @@ enum ehci_hcd_omap_mode { | |||
| 11 | EHCI_HCD_OMAP_MODE_UNKNOWN, | 11 | EHCI_HCD_OMAP_MODE_UNKNOWN, |
| 12 | EHCI_HCD_OMAP_MODE_PHY, | 12 | EHCI_HCD_OMAP_MODE_PHY, |
| 13 | EHCI_HCD_OMAP_MODE_TLL, | 13 | EHCI_HCD_OMAP_MODE_TLL, |
| 14 | EHCI_HCD_OMAP_MODE_HSIC, | ||
| 14 | }; | 15 | }; |
| 15 | 16 | ||
| 16 | enum ohci_omap3_port_mode { | 17 | enum ohci_omap3_port_mode { |
| @@ -69,6 +70,10 @@ struct omap_musb_board_data { | |||
| 69 | u8 mode; | 70 | u8 mode; |
| 70 | u16 power; | 71 | u16 power; |
| 71 | unsigned extvbus:1; | 72 | unsigned extvbus:1; |
| 73 | void (*set_phy_power)(u8 on); | ||
| 74 | void (*clear_irq)(void); | ||
| 75 | void (*set_mode)(u8 mode); | ||
| 76 | void (*reset)(void); | ||
| 72 | }; | 77 | }; |
| 73 | 78 | ||
| 74 | enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI}; | 79 | enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI}; |
| @@ -79,6 +84,11 @@ extern void usb_ehci_init(const struct ehci_hcd_omap_platform_data *pdata); | |||
| 79 | 84 | ||
| 80 | extern void usb_ohci_init(const struct ohci_hcd_omap_platform_data *pdata); | 85 | extern void usb_ohci_init(const struct ohci_hcd_omap_platform_data *pdata); |
| 81 | 86 | ||
| 87 | extern int omap4430_phy_power(struct device *dev, int ID, int on); | ||
| 88 | extern int omap4430_phy_set_clk(struct device *dev, int on); | ||
| 89 | extern int omap4430_phy_init(struct device *dev); | ||
| 90 | extern int omap4430_phy_exit(struct device *dev); | ||
| 91 | |||
| 82 | #endif | 92 | #endif |
| 83 | 93 | ||
| 84 | 94 | ||