usb: EHCI, OHCI: Add configuration for the SH USB controller

The SH EHCI/OHCI driver hardcoded the CPU type in {ehci,ohci}-hcd.c.
So if we will add the new CPU, we had to add to the hcd driver each time.
The patch adds the CONFIG_USB_{EHCI,OHCI}_SH configuration. So if we
want to use the SH EHCI/OHCI, we only enable the configuration.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 923e5a079b592f62e16838d8c7db056cb831bb76..9116d30bcdacf66020d28017fb89ab57bfeb9fa2 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -173,6 +173,13 @@ config USB_EHCI_HCD_PPC_OF
          Enables support for the USB controller present on the PowerPC
          OpenFirmware platform bus.
 
+config USB_EHCI_SH
+       bool "EHCI support for SuperH USB controller"
+       depends on USB_EHCI_HCD && SUPERH
+       ---help---
+         Enables support for the on-chip EHCI controller on the SuperH.
+         If you use the PCI EHCI controller, this option is not necessary.
+
 config USB_W90X900_EHCI
        bool "W90X900(W90P910) EHCI support"
        depends on USB_EHCI_HCD && ARCH_W90X900
@@ -326,6 +333,13 @@ config USB_OHCI_HCD_SSB
 
          If unsure, say N.
 
+config USB_OHCI_SH
+       bool "OHCI support for SuperH USB controller"
+       depends on USB_OHCI_HCD && SUPERH
+       ---help---
+         Enables support for the on-chip OHCI controller on the SuperH.
+         If you use the PCI OHCI controller, this option is not necessary.
+
 config USB_CNS3XXX_OHCI
        bool "Cavium CNS3XXX OHCI Module"
        depends on USB_OHCI_HCD && ARCH_CNS3XXX

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index e6277536f39289c950436851dc2fb1980bf94042..cfeb24b3ee094f6948b24abec9783b0021c4e831 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1180,7 +1180,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER                ehci_mxc_driver
 #endif
 
-#ifdef CONFIG_CPU_SUBTYPE_SH7786
+#ifdef CONFIG_USB_EHCI_SH
 #include "ehci-sh.c"
 #define PLATFORM_DRIVER                ehci_hcd_sh_driver
 #endif

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 7b791bf1e7b48668c0b4dafef873ce694391e40a..fb035751e4b28573e5ce37b195ea855defa9df4c 100644 (file)
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1059,10 +1059,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER                ohci_hcd_da8xx_driver
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7721) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7786)
+#ifdef CONFIG_USB_OHCI_SH
 #include "ohci-sh.c"
 #define PLATFORM_DRIVER                ohci_hcd_sh_driver
 #endif