Message ID | 201403201257.56090.arnd@arndb.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thursday 20 March 2014 05:27 PM, Arnd Bergmann wrote: > On Thursday 20 March 2014, Sekhar Nori wrote: >> diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c >> index 3586460..c807d3f 100644 >> --- a/drivers/usb/host/ohci-hcd.c >> +++ b/drivers/usb/host/ohci-hcd.c >> @@ -1178,7 +1178,8 @@ MODULE_LICENSE ("GPL"); >> #define SA1111_DRIVER ohci_hcd_sa1111_driver >> #endif >> >> -#ifdef CONFIG_ARCH_DAVINCI_DA8XX >> +/* DA8XX uses platform internal symbols. Cannot be built as module. */ >> +#if defined(CONFIG_ARCH_DAVINCI_DA8XX) && !defined(CONFIG_USB_OHCI_HCD_MODULE) >> #include "ohci-da8xx.c" >> #define DAVINCI_PLATFORM_DRIVER ohci_hcd_da8xx_driver >> #endif > > I wouldn't want to submit that patch to GregKH ;-) > > How about doing the same thing in a somewhat less sneaky way? > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Much better! Please feel free to add Acked-by: Sekhar Nori <nsekhar@ti.com> if it helps. Regards, Sekhar
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 0fe936c..857250a 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -417,6 +417,16 @@ config USB_OHCI_HCD_OMAP3 Enables support for the on-chip OHCI controller on OMAP3 and later chips. +config USB_OHCI_HCD_DAVINCI + bool "OHCI support for TI DaVinci DA8xx" + depends on ARCH_DAVINCI_DA8XX + depends on USB_OHCI_HCD=y + default y + help + Enables support for the DaVinci DA8xx integrated OHCI + controller. This driver cannot currently be a loadable + module because it lacks a proper PHY abstraction. + config USB_OHCI_ATH79 bool "USB OHCI support for the Atheros AR71XX/AR7240 SoCs (DEPRECATED)" depends on (SOC_AR71XX || SOC_AR724X) diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 3586460..f98d03f 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1178,7 +1178,7 @@ MODULE_LICENSE ("GPL"); #define SA1111_DRIVER ohci_hcd_sa1111_driver #endif -#ifdef CONFIG_ARCH_DAVINCI_DA8XX +#ifdef CONFIG_USB_OHCI_HCD_DAVINCI #include "ohci-da8xx.c" #define DAVINCI_PLATFORM_DRIVER ohci_hcd_da8xx_driver #endif