1 --- a/drivers/usb/host/Kconfig
2 +++ b/drivers/usb/host/Kconfig
3 @@ -81,6 +81,12 @@ config USB_EHCI_BIG_ENDIAN_DESC
4 depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
7 +config USB_EHCI_AR71XX
8 + bool "USB EHCI support for AR71xx"
9 + depends on USB_EHCI_HCD && ATHEROS_AR71XX
11 + Support for Atheros AR71xx built-in EHCI controller
14 bool "Support for Freescale on-chip EHCI USB controller"
15 depends on USB_EHCI_HCD && FSL_SOC
16 @@ -141,6 +147,12 @@ config USB_OHCI_HCD
17 To compile this driver as a module, choose M here: the
18 module will be called ohci-hcd.
20 +config USB_OHCI_AR71XX
21 + bool "USB OHCI support for Atheros AR71xx"
22 + depends on USB_OHCI_HCD && ATHEROS_AR71XX
24 + Support for Atheros AR71xx built-in OHCI controller
26 config USB_OHCI_HCD_PPC_SOC
27 bool "OHCI support for on-chip PPC USB controller"
28 depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
29 --- a/drivers/usb/host/ehci-hcd.c
30 +++ b/drivers/usb/host/ehci-hcd.c
31 @@ -1039,6 +1039,11 @@ MODULE_LICENSE ("GPL");
32 #define PLATFORM_DRIVER ixp4xx_ehci_driver
35 +#ifdef CONFIG_USB_EHCI_AR71XX
36 +#include "ehci-ar71xx.c"
37 +#define PLATFORM_DRIVER ehci_ar71xx_driver
40 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
41 !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
42 #error "missing bus glue for ehci-hcd"
43 --- a/drivers/usb/host/ohci.h
44 +++ b/drivers/usb/host/ohci.h
45 @@ -549,6 +549,11 @@ static inline struct usb_hcd *ohci_to_hc
46 #define writel_be(val, addr) out_be32((__force unsigned *)addr, val)
49 +#if defined(CONFIG_ATHEROS_AR71XX)
50 +#define readl_be(addr) __raw_readl(addr)
51 +#define writel_be(val, addr) __raw_writel(addr, val)
54 static inline unsigned int _ohci_readl (const struct ohci_hcd *ohci,
55 __hc32 __iomem * regs)
57 --- a/drivers/usb/host/ohci-hcd.c
58 +++ b/drivers/usb/host/ohci-hcd.c
59 @@ -1078,6 +1078,11 @@ MODULE_LICENSE ("GPL");
60 #define SM501_OHCI_DRIVER ohci_hcd_sm501_driver
63 +#ifdef CONFIG_USB_OHCI_AR71XX
64 +#include "ohci-ar71xx.c"
65 +#define PLATFORM_DRIVER ohci_hcd_ar71xx_driver
68 #if !defined(PCI_DRIVER) && \
69 !defined(PLATFORM_DRIVER) && \
70 !defined(OF_PLATFORM_DRIVER) && \