summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/Kconfig
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2011-04-19 20:37:33 -0700
committerBenoit Goby <benoit@android.com>2011-06-17 16:02:37 -0700
commitaab96815ae9a40e05600b8e351561b514233afca (patch)
treeb96a69b2be5f648ee17581246acf97895f1c72bf /drivers/usb/gadget/Kconfig
parent94df1bdfdca9be6d4bbe6cc56354b4ee536cb15a (diff)
usb: gadget: android: Update android gadget driver
* Functions and the device descriptor are configured from user space: echo 0 > /sys/class/android_usb/android0/enable echo adb,acm > /sys/class/android_usb/android0/functions echo 2 > /sys/class/android_usb/android0/f_acm/instances echo 1 > /sys/class/android_usb/android0/enable * Driver does not require platform data anymore * Moved function initialization to android.c instead of each function file * Replaced switches by uevents Signed-off-by: Benoit Goby <benoit@android.com> Signed-off-by: Mike Lockwood <lockwood@android.com> Change-Id: If5ad9267c111ad0a442f0d87a0d31082dc5381b6
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
-rw-r--r--drivers/usb/gadget/Kconfig49
1 files changed, 1 insertions, 48 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 5b3c58e86f7..144a8c863b3 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -935,7 +935,7 @@ config USB_G_PRINTER
For more information, see Documentation/usb/gadget_printer.txt
which includes sample code for accessing the device file.
-config USB_ANDROID
+config USB_G_ANDROID
boolean "Android Gadget"
depends on SWITCH
help
@@ -943,53 +943,6 @@ config USB_ANDROID
The functions can be configured via a board file and may be
enabled and disabled dynamically.
-config USB_ANDROID_ACM
- boolean "Android gadget ACM serial function"
- depends on USB_ANDROID
- help
- Provides ACM serial function for android gadget driver.
-
-config USB_ANDROID_ADB
- boolean "Android gadget adb function"
- depends on USB_ANDROID
- help
- Provides adb function for android gadget driver.
-
-config USB_ANDROID_MASS_STORAGE
- boolean "Android gadget mass storage function"
- depends on USB_ANDROID && SWITCH
- help
- Provides USB mass storage function for android gadget driver.
-
-config USB_ANDROID_MTP
- boolean "Android MTP function"
- depends on USB_ANDROID
- help
- Provides Media Transfer Protocol (MTP) support for android gadget driver.
-
-config USB_ANDROID_RNDIS
- boolean "Android gadget RNDIS ethernet function"
- depends on USB_ANDROID
- help
- Provides RNDIS ethernet function for android gadget driver.
-
-config USB_ANDROID_RNDIS_WCEIS
- boolean "Use Windows Internet Sharing Class/SubClass/Protocol"
- depends on USB_ANDROID_RNDIS
- help
- Causes the driver to look like a Windows-compatible Internet
- Sharing device, so Windows auto-detects it.
-
- If you enable this option, the device is no longer CDC ethernet
- compatible.
-
-
-config USB_ANDROID_ACCESSORY
- boolean "Android USB accessory function"
- depends on USB_ANDROID
- help
- Provides Android USB Accessory support for android gadget driver.
-
config USB_CDC_COMPOSITE
tristate "CDC Composite Device (Ethernet and ACM)"
depends on NET