usb: renesas_usbhs: compile/config are rescued

This patch rescues renesas_usbhs compile from
commit 193ab2a (usb: gadget: allow multiple gadgets to be built)

CONFIG_USB_RENESAS_USBHS compile renesas_usbhs main code which
is shared between Host/Gadget.
CONFIG_USB_RENESAS_USBHS_UDC add mod_gadget to it.

It had lost USB_GADGET_DUALSPEED

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 8cd999a217b63f8fd8ff8bfd069173b6e6ca19b4..48f1781352f154e9820eda618696c9e3d486c0af 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -118,6 +118,8 @@ source "drivers/usb/host/Kconfig"
 
 source "drivers/usb/musb/Kconfig"
 
+source "drivers/usb/renesas_usbhs/Kconfig"
+
 source "drivers/usb/class/Kconfig"
 
 source "drivers/usb/storage/Kconfig"

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 46a253adde3117249a11e7e7165830bfe0d13eb2..b5b8d67f656834d2e4606387ec136c75d97f4135 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -215,9 +215,11 @@ config USB_R8A66597
           dynamically linked module called "r8a66597_udc" and force all
           gadget drivers to also be dynamically linked.
 
-config USB_RENESAS_USBHS
+config USB_RENESAS_USBHS_UDC
        tristate 'Renesas USBHS controller'
        depends on SUPERH || ARCH_SHMOBILE
+       depends on USB_RENESAS_USBHS
+       select USB_GADGET_DUALSPEED
        help
           Renesas USBHS is a discrete USB host and peripheral controller chip
           that supports both full and high speed USB 2.0 data transfers.

diff --git a/drivers/usb/renesas_usbhs/Kconfig b/drivers/usb/renesas_usbhs/Kconfig
new file mode 100644 (file)
index 0000000..286cbf1
--- /dev/null
+++ b/drivers/usb/renesas_usbhs/Kconfig
@@ -0,0 +1,15 @@
+#
+# Renesas USBHS Controller Drivers
+#
+
+config USB_RENESAS_USBHS
+       tristate 'Renesas USBHS controller'
+       depends on SUPERH || ARCH_SHMOBILE
+       default n
+       help
+         Renesas USBHS is a discrete USB host and peripheral controller chip
+         that supports both full and high speed USB 2.0 data transfers.
+         It has nine or more configurable endpoints, and endpoint zero.
+
+         Say "y" to link the driver statically, or "m" to build a
+         dynamically linked module called "renesas_usbhs"