Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60b0bf0f authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

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: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ad93562b

drivers/usb/host/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -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

drivers/usb/host/ehci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/usb/host/ohci-hcd.c

+1 −4
Original line number Diff line number Diff line
@@ -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