diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:54 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:54 +0100 |
| commit | 678832e17a401819349bbea0425de44c7cdd288c (patch) | |
| tree | a9711e29f0567aba0fe0e848649128452121e40a /include/usb | |
| parent | ea0f831cd0c749194a0103ec4814fe91c3955084 (diff) | |
| parent | 0a643b3d426e606dd42678b87a1fe205aea2b9e7 (diff) | |
| download | barebox-678832e17a401819349bbea0425de44c7cdd288c.tar.gz barebox-678832e17a401819349bbea0425de44c7cdd288c.tar.xz | |
Merge branch 'for-next/usb'
Diffstat (limited to 'include/usb')
| -rw-r--r-- | include/usb/chipidea-imx.h | 3 | ||||
| -rw-r--r-- | include/usb/ehci.h | 5 | ||||
| -rw-r--r-- | include/usb/fsl_usb2.h | 6 |
3 files changed, 14 insertions, 0 deletions
diff --git a/include/usb/chipidea-imx.h b/include/usb/chipidea-imx.h index e98cc891b7..3f9f61ee17 100644 --- a/include/usb/chipidea-imx.h +++ b/include/usb/chipidea-imx.h @@ -9,6 +9,7 @@ #define MXC_EHCI_MODE_UTMI_16_BIT ((0 << 30) | (1 << 28)) #define MXC_EHCI_MODE_PHILIPS (1 << 30) #define MXC_EHCI_MODE_ULPI (2 << 30) +#define MXC_EHCI_MODE_HSIC (1 << 25) #define MXC_EHCI_MODE_SERIAL (3 << 30) /* @@ -39,8 +40,10 @@ enum imx_usb_mode { struct imxusb_platformdata { unsigned long flags; enum imx_usb_mode mode; + int (*init)(int port); }; int imx_usbmisc_port_init(int port, unsigned flags); +int imx_usbmisc_port_post_init(int port, unsigned flags); #endif /* __USB_CHIPIDEA_IMX_H */ diff --git a/include/usb/ehci.h b/include/usb/ehci.h index 437711697d..93f980d34f 100644 --- a/include/usb/ehci.h +++ b/include/usb/ehci.h @@ -11,6 +11,11 @@ struct ehci_data { void __iomem *hccr; void __iomem *hcor; unsigned long flags; + + /* platform specific init functions */ + int (*init)(void *drvdata); + int (*post_init)(void *drvdata); + void *drvdata; }; #ifdef CONFIG_USB_EHCI diff --git a/include/usb/fsl_usb2.h b/include/usb/fsl_usb2.h index fd37adebc8..dec3933d82 100644 --- a/include/usb/fsl_usb2.h +++ b/include/usb/fsl_usb2.h @@ -1,3 +1,6 @@ +#ifndef __USB_FSL_USB2_H +#define __USB_FSL_USB2_H + enum fsl_usb2_operating_modes { FSL_USB2_MPH_HOST, FSL_USB2_DR_HOST, @@ -20,3 +23,6 @@ struct fsl_usb2_platform_data { unsigned int port_enables; }; +int ci_udc_register(struct device_d *dev, void __iomem *regs); + +#endif /* __USB_FSL_USB2_H */ |