diff options
author | Avinash Kumar <avinash.kumar@stericsson.com> | 2011-09-19 15:36:01 +0530 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:22:30 +0200 |
commit | 4b9ab4aad7eb969c04bff4d194b500e2af820304 (patch) | |
tree | 9a5fffb06d768ccd70a10afb829df2fd26157545 /arch/arm/mach-ux500/include/mach | |
parent | 7aa5ea47addd0a78f08702785dc2d3ca85c09dfa (diff) |
usb:Migrate the patches to kernel 3.0
Following patches for usb driver are manually merged to kernel 3.0
d11e52a ux500: usb: add usb device mode support on u5500
1fecc55 ux500: usb: enabling adb and ACM functionality in u5500_defconfig
2847bf4 ux500: usb: error handling in musb for u5500
37f22da ux500: usb: U5500 v2 update
e1b079d ux500: usb: Fix for enumeration when ON with cable
181701a ux500: usb: Fix for V2 emmc2 boot USB device issue
3a60721 mach-ux500: Handle the LinkStatus register.
086a83e usb: ux500: usb gpio enable/disable in pair
ST-Ericsson ID: 352334
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA
Change-Id: Id918b9a55d3b85faf7c003547748f17086af3ec7
Signed-off-by: Avinash Kumar <avinash.kumar@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30860
Diffstat (limited to 'arch/arm/mach-ux500/include/mach')
-rw-r--r-- | arch/arm/mach-ux500/include/mach/usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/include/mach/usb.h b/arch/arm/mach-ux500/include/mach/usb.h index 6277958c8a5..e3f4858c2e8 100644 --- a/arch/arm/mach-ux500/include/mach/usb.h +++ b/arch/arm/mach-ux500/include/mach/usb.h @@ -28,6 +28,7 @@ struct abx500_usbgpio_platform_data { void (*enable)(void); void (*disable)(void); void (*put)(void); + int usb_cs; }; #endif |