From mboxrd@z Thu Jan 1 00:00:00 1970 From: ezequiel.garcia@free-electrons.com (Ezequiel Garcia) Date: Sat, 16 Feb 2013 11:19:25 -0300 Subject: [PATCH 2/2] USB: EHCI: make ehci-orion a separate driver In-Reply-To: <1360966349-1242560-2-git-send-email-arnd@arndb.de> References: <201302152158.23446.arnd@arndb.de> <1360966349-1242560-1-git-send-email-arnd@arndb.de> <1360966349-1242560-2-git-send-email-arnd@arndb.de> Message-ID: <20130216141924.GA2473@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Arnd, On Fri, Feb 15, 2013 at 11:12:29PM +0100, Arnd Bergmann wrote: > From: Manjunath Goudar > > 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 > Signed-off-by: Arnd Bergmann > Cc: Jason Cooper > Cc: Andrew Lunn > --- > 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