USB: EHCI: make ehci-atmel a separate driver
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): 1360669523-15010-1-git-send-email-y
PATCH 1/1 USB: EHCI: make ehci-atmel a separate driver
From: Manjunath Goudar <[email protected]>
Separate the Atmel host controller driver from ehci-hcd host code into its own driver module.
Signed-off-by Manjunath Goudar <[email protected]>
Cc Alan Stern <[email protected]>
Cc Greg KH <[email protected]>
Cc Grant Likely <[email protected]>
Cc Rob Herring <[email protected]>
Cc Andrew Victor <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Jean-Christophe Plagniol-Villard <[email protected]>
Cc linux-usb at vger.kernel.org
Cc linux-kernel at vger.kernel.org
--- drivers/usb/host/Kconfig | 8 +++++ drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-atmel.c | 76 ++++++++++++++++++++++------------------- drivers/usb/host/ehci-hcd.c | 10 ++---- drivers/usb/host/ehci.h | 2 +- 5 files changed, 53 insertions(+), 44 deletions(-)
drivers/usb/host/Kconfig +8 -0
@@ -170,6 +170,14 @@ config USB_EHCI_HCD_SPEAR Enables support for the on-chip EHCI controller on ST SPEAr chips. +config USB_EHCI_HCD_AT91 + tristate "Support for Atmel on-chip EHCI USB controller" + depends on USB_EHCI_HCD && ARCH_AT91 + default y + ---help--- + Enables support for the on-chip EHCI controller on + Atmel chips. + config USB_EHCI_MSM bool "Support for MSM on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_MSM
drivers/usb/host/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o obj-$(CONFIG_USB_EHCI_HCD_SPEAR)+= ehci-spear.o obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o +obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
drivers/usb/host/ehci-atmel.c +40 -36
94 lines not on this page · raw message
drivers/usb/host/ehci-hcd.c +3 -7
@@ -352,7 +352,7 @@ static void ehci_silence_controller(struct ehci_hcd *ehci)* This forcibly disables dma and IRQs, helping kexec and other cases * where the next system software may expect clean state. */ -static void ehci_shutdown (struct usb_hcd *hcd) +void ehci_shutdown (struct usb_hcd *hcd) {struct ehci_hcd *ehci =hcd_to_ehci (hcd);
@@ -366,7 +366,7 @@ static void ehci_shutdown(struct usb_hcd *hcd)hrtimer_cancel (&ehci->hrtimer); } - +EXPORT_SYMBOL_GPL (ehci_shutdown);/*-------------------------------------------------------------------------*/ /*
@@ -1282,11 +1282,6 @@ MODULE_LICENSE ("GPL");#define PLATFORM_DRIVER ehci_hcd_w90x900_driver#endif -#ifdef CONFIG_ARCH_AT91 -#include "ehci-atmel.c" -#define PLATFORM_DRIVER ehci_atmel_driver -#endif -#ifdef CONFIG_USB_OCTEON_EHCI #include "ehci-octeon.c" #define PLATFORM_DRIVER ehci_octeon_driver
@@ -1343,6 +1338,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED (CONFIG_USB_EHCI_MXC ) && \ !IS_ENABLED (CONFIG_PLAT_SPEAR ) && \ !defined (PLATFORM_DRIVER ) && \ + !IS_ENABLED (CONFIG_ARCH_AT91 ) && \ !defined (PS3_SYSTEM_BUS_DRIVER ) && \ !defined (OF_PLATFORM_DRIVER ) && \ !defined (XILINX_OF_PLATFORM_DRIVER )
drivers/usb/host/ehci.h +1 -1
@@ -798,7 +798,7 @@ struct ehci_driver_overrides {extern void ehci_init_driver (struct hc_driver *drv,const struct ehci_driver_overrides *over);extern int ehci_setup (struct usb_hcd *hcd); - +extern void ehci_shutdown (struct usb_hcd *hcd);#ifdef CONFIG_PM extern int ehci_suspend (struct usb_hcd *hcd,bool do_wakeup);extern int ehci_resume (struct usb_hcd *hcd,bool hibernated);
Signature · 1 line
1.7.9.5