diff options
| author | Afzal Mohammed | 2012-11-27 15:45:22 +0100 |
|---|---|---|
| committer | Felipe Balbi | 2012-12-13 10:59:02 +0100 |
| commit | deeeb9ee1ed5b06864f530c6123976209badd489 (patch) | |
| tree | 9d657315913d672c6a6bc2578497cee180b05d8e /drivers/usb | |
| parent | usb: gadget: dummy: fix enumeration with g_multi (diff) | |
| download | kernel-qcow2-linux-deeeb9ee1ed5b06864f530c6123976209badd489.tar.gz kernel-qcow2-linux-deeeb9ee1ed5b06864f530c6123976209badd489.tar.xz kernel-qcow2-linux-deeeb9ee1ed5b06864f530c6123976209badd489.zip | |
usb: musb: dsps: header movement build error fix
"54db6ee ARM: OMAP2+: Introduce local usb.h" moved control module bit
definitions from plat/usb.h (which dsps glue was using) to a local
header in mach-omap2. And in parallel,
"c68bb4c usb: musb: dsps: control module handling (quirk)" added
control module handling capability to dsps glue driver that used
those control module bit definitions.
Integration of above two changes would cause build error in musb dsps
glue driver (they go through different trees upstream) as is seen now
in linux-next. Fix it by adding necessary definitions in dsps glue
driver.
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/musb/musb_dsps.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index e6f2ae8368bb..f7d764de6fda 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -134,6 +134,11 @@ static const resource_size_t dsps_control_module_phys[] = { DSPS_AM33XX_CONTROL_MODULE_PHYS_1, }; +#define USBPHY_CM_PWRDN (1 << 0) +#define USBPHY_OTG_PWRDN (1 << 1) +#define USBPHY_OTGVDET_EN (1 << 19) +#define USBPHY_OTGSESSEND_EN (1 << 20) + /** * musb_dsps_phy_control - phy on/off * @glue: struct dsps_glue * |