Commit 068413e9 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

usb: ohci-da8xx can only be built-in

The PHY setup code of the TI DaVinci DA8xx OHCI controller
uses ad-hoc register access using a pointer that is meant to
be used only by the DaVinci platform implementation and that
is intentionally not exported to loadable modules. This results
in a link error on configurations that use a modular OHCI
code on this platform.

While the proper solution for this problem would be to
implement a real PHY driver shared by ohci-da8xx and musb-da8xx,
this patch for now just works around the build error by
only allowing the ohci-da8xx code to be built-in.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 274f6afa
...@@ -435,6 +435,16 @@ config USB_OHCI_HCD_OMAP3 ...@@ -435,6 +435,16 @@ config USB_OHCI_HCD_OMAP3
Enables support for the on-chip OHCI controller on Enables support for the on-chip OHCI controller on
OMAP3 and later chips. 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 config USB_OHCI_ATH79
bool "USB OHCI support for the Atheros AR71XX/AR7240 SoCs (DEPRECATED)" bool "USB OHCI support for the Atheros AR71XX/AR7240 SoCs (DEPRECATED)"
depends on (SOC_AR71XX || SOC_AR724X) depends on (SOC_AR71XX || SOC_AR724X)
......
...@@ -1178,7 +1178,7 @@ MODULE_LICENSE ("GPL"); ...@@ -1178,7 +1178,7 @@ MODULE_LICENSE ("GPL");
#define SA1111_DRIVER ohci_hcd_sa1111_driver #define SA1111_DRIVER ohci_hcd_sa1111_driver
#endif #endif
#ifdef CONFIG_ARCH_DAVINCI_DA8XX #ifdef CONFIG_USB_OHCI_HCD_DAVINCI
#include "ohci-da8xx.c" #include "ohci-da8xx.c"
#define DAVINCI_PLATFORM_DRIVER ohci_hcd_da8xx_driver #define DAVINCI_PLATFORM_DRIVER ohci_hcd_da8xx_driver
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment