diff options
| author | Brian Swetland <swetland@google.com> | 2010-10-14 02:36:32 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-16 21:48:41 -0800 |
| commit | 636788003df5588470cee690ad50421b3f07fcc9 (patch) | |
| tree | 14e9836ac3d0d17badf0fc992eb6fbbdf32c93f0 /arch/arm | |
| parent | 9db142e5fc4b7c2499e8dcf7afb673ae7ad887dd (diff) | |
| download | kernel_samsung_crespo-636788003df5588470cee690ad50421b3f07fcc9.zip kernel_samsung_crespo-636788003df5588470cee690ad50421b3f07fcc9.tar.gz kernel_samsung_crespo-636788003df5588470cee690ad50421b3f07fcc9.tar.bz2 | |
USB: Added suppport for Samsung UDC controller and Android gadget (ADB+UMS)
Following files are modified-
1: mach-herring.c: Add mass storage device only if mass storage is defined in config.
2: devs.c: Added config macros for mass storage.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/devs.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index c6900ca..26093c9 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -2792,8 +2792,10 @@ static struct platform_device *herring_devices[] __initdata = { #endif #ifdef CONFIG_USB_ANDROID &s3c_device_android_usb, +#ifdef CONFIG_USB_ANDROID_MASS_STORAGE &s3c_device_usb_mass_storage, #endif +#endif #ifdef CONFIG_S3C_DEV_HSMMC &s3c_device_hsmmc0, diff --git a/arch/arm/plat-s5p/devs.c b/arch/arm/plat-s5p/devs.c index 53de7cf..a3c4b5b 100644 --- a/arch/arm/plat-s5p/devs.c +++ b/arch/arm/plat-s5p/devs.c @@ -44,6 +44,9 @@ static char *usb_functions_ums[] = { "usb_mass_storage", }; +static char *usb_functions_adb[] = { + "adb", +}; static char *usb_functions_rndis[] = { "rndis", @@ -62,7 +65,9 @@ static char *usb_functions_all[] = { #ifdef CONFIG_USB_ANDROID_RNDIS "rndis", #endif +#ifdef CONFIG_USB_ANDROID_MASS_STORAGE "usb_mass_storage", +#endif "adb", #ifdef CONFIG_USB_ANDROID_ACM "acm", @@ -76,6 +81,11 @@ static struct android_usb_product usb_products[] = { }, { .product_id = S3C_ADB_PRODUCT_ID, + .num_functions = ARRAY_SIZE(usb_functions_adb), + .functions = usb_functions_adb, + }, + { + .product_id = S3C_ADB_PRODUCT_ID, .num_functions = ARRAY_SIZE(usb_functions_ums_adb), .functions = usb_functions_ums_adb, }, |