Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index a096d6f0932bfb47f854ace0d628cb708c3c1673..9fdaf6c87e039d3c78073f5f43de197e6113ab96 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -112,6 +112,7 @@ config      USB_GADGET_SELECTED
 choice
        prompt "USB Peripheral Controller"
        depends on USB_GADGET
+       default USB_GADGET_DWC_OTG      
        help
           A USB device uses a controller to talk to its host.
           Systems should have only one such upstream link.
@@ -505,6 +506,18 @@ config USB_LANGWELL
        default USB_GADGET
        select USB_GADGET_SELECTED
 
+config USB_GADGET_DWC_OTG
+        boolean "Synopsys DWC OTG Controller"
+        select USB_GADGET_DUALSPEED
+        help
+           This driver provides USB Device Controller support for the
+           Synopsys DesignWare USB OTG Core used on the Rockchip RK28.
+
+config USB_DWC_OTG
+        tristate
+        depends on USB_GADGET_DWC_OTG
+        default USB_GADGET
+        select USB_GADGET_SELECTED
 
 #
 # LAST -- dummy/emulated controller
@@ -556,9 +569,9 @@ config USB_GADGET_DUALSPEED
 # USB Gadget Drivers
 #
 choice
-       tristate "USB Gadget Drivers"
+       bool "USB Gadget Drivers"
        depends on USB_GADGET && USB_GADGET_SELECTED
-       default USB_ETH
+       default USB_ANDROID
        help
          A Linux "Gadget Driver" talks to the USB Peripheral Controller
          driver through the abstract "gadget" API.  Some other operating