summaryrefslogtreecommitdiff
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2011-10-17 10:45:15 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 08:50:37 +0100
commit7ac9e3b8e02d3c3ed31d8a1285cbfff54a28aeb5 (patch)
treedd2a7ff23f86bfdf3c38af9354a7bdbdc8989d48 /include/linux/mfd
parent4b4ef27f2a393ec5bacbb1c531039510ba4a422c (diff)
ab5500 mfd: 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 Signed-off-by: Avinash Kumar <avinash.kumar@stericsson.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/abx500/ab5500.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/abx500/ab5500.h b/include/linux/mfd/abx500/ab5500.h
index 6bfca05188a..61075adf0a8 100644
--- a/include/linux/mfd/abx500/ab5500.h
+++ b/include/linux/mfd/abx500/ab5500.h
@@ -154,6 +154,7 @@ struct ab5500_platform_data {
unsigned int init_settings_sz;
bool pm_power_off;
struct ab5500_regulator_platform_data *regulator;
+ struct ab5500_usbgpio_platform_data *usb;
};
struct ab5500_ponkey_platform_data {