[PATCH 2/2] USB: EHCI: make ehci-orion a separate driver
Ezequiel Garcia
ezequiel.garcia at free-electrons.com
Sat Feb 16 09:19:25 EST 2013
Hi Arnd,
On Fri, Feb 15, 2013 at 11:12:29PM +0100, Arnd Bergmann wrote:
> From: Manjunath Goudar <manjunath.goudar at linaro.org>
>
> With the multiplatform changes in arm-soc tree, it becomes
> possible to enable the mvebu platform (which uses
> ehci-orion) at the same time as other platforms that require
> a conflicting EHCI bus glue. At the moment, this results
> in a warning like
>
> drivers/usb/host/ehci-hcd.c:1297:0: warning: "PLATFORM_DRIVER" redefined [enabled by default]
> drivers/usb/host/ehci-hcd.c:1277:0: note: this is the location of the previous definition
> drivers/usb/host/ehci-orion.c:334:31: warning: 'ehci_orion_driver' defined but not used [-Wunused-variable]
>
> and an ehci driver that only works on one of them.
>
> With the infrastructure added by Alan Stern in patch 3e0232039
> "USB: EHCI: prepare to make ehci-hcd a library module", we can
> avoid this problem by turning a bus glue into a separate
> module, as we do here for the orion bus glue.
>
> Signed-off-by: Manjunath Goudar <manjunath.goudar at linaro.org>
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> Cc: Jason Cooper <jason at lakedaemon.net>
> Cc: Andrew Lunn <andrew at lunn.ch>
> ---
> drivers/usb/host/Kconfig | 8 ++++
> drivers/usb/host/Makefile | 1 +
> drivers/usb/host/ehci-hcd.c | 6 +--
> drivers/usb/host/ehci-orion.c | 90 ++++++++++++++++++++-----------------------
> 4 files changed, 52 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index d77e028..7ac6f48 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -162,6 +162,14 @@ config USB_EHCI_HCD_OMAP
> Enables support for the on-chip EHCI controller on
> OMAP3 and later chips.
>
> +config USB_EHCI_HCD_ORION
> + tristate "Support for Marvell Orion on-chip EHCI USB controller"
> + depends on USB_EHCI_HCD && PLAT_ORION
> + default y
> + ---help---
> + Enables support for the on-chip EHCI controller on
> + Morvell Orion chips.
s/Morvell/Marvell
Just this tiny nitpick.
Thanks,
--
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
More information about the linux-arm-kernel
mailing list