In linux-3.8-rc1 it became possible to build the imx and mvebu platforms together in a single kernel, which clashes in the ehci driver.
Manjunath Goudar is already working on a patch to convert both the imx and the mvebu glue drivers (along with all the other ARM specific ones) to the new probing method, but that will be too late to fix v3.8. This patch instead adds yet another hack like the existing ones to allow the ehci driver to load both back-ends. Without this patch, building allyesconfig results in: drivers/usb/host/ehci-hcd.c:1285:0: error: "PLATFORM_DRIVER" redefined drivers/usb/host/ehci-hcd.c:1255:0: note: this is the location of the previous definition In file included from drivers/usb/host/ehci-hcd.c:1254:0: drivers/usb/host/ehci-mxc.c:280:31: warning: 'ehci_mxc_driver' defined but not used Signed-off-by: Arnd Bergmann <[email protected]> Cc: Alan Stern <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: [email protected] Cc: Manjunath Goudar <[email protected]> Cc: Shawn Guo <[email protected]> Cc: Sascha Hauer <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Gregory Clement <[email protected]> --- drivers/usb/host/ehci-hcd.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index c97503b..92e7180 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1282,7 +1282,7 @@ MODULE_LICENSE ("GPL"); #ifdef CONFIG_PLAT_ORION #include "ehci-orion.c" -#define PLATFORM_DRIVER ehci_orion_driver +#define ORION_PLATFORM_DRIVER ehci_orion_driver #endif #ifdef CONFIG_USB_W90X900_EHCI @@ -1353,6 +1353,7 @@ MODULE_LICENSE ("GPL"); #if !IS_ENABLED(CONFIG_USB_EHCI_PCI) && \ !IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \ !defined(CONFIG_USB_CHIPIDEA_HOST) && \ + !defined(ORION_PLATFORM_DRIVER) && \ !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ @@ -1393,6 +1394,12 @@ static int __init ehci_hcd_init(void) goto clean0; #endif +#ifdef ORION_PLATFORM_DRIVER + retval = platform_driver_register(&ORION_PLATFORM_DRIVER); + if (retval < 0) + goto clean1; +#endif + #ifdef PS3_SYSTEM_BUS_DRIVER retval = ps3_ehci_driver_register(&PS3_SYSTEM_BUS_DRIVER); if (retval < 0) @@ -1424,6 +1431,10 @@ clean3: ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER); clean2: #endif +#ifdef ORION_PLATFORM_DRIVER + platform_driver_unregister(&ORION_PLATFORM_DRIVER); +clean1: +#endif #ifdef PLATFORM_DRIVER platform_driver_unregister(&PLATFORM_DRIVER); clean0: @@ -1446,6 +1457,9 @@ static void __exit ehci_hcd_cleanup(void) #ifdef OF_PLATFORM_DRIVER platform_driver_unregister(&OF_PLATFORM_DRIVER); #endif +#ifdef ORION_PLATFORM_DRIVER + platform_driver_unregister(&ORION_PLATFORM_DRIVER); +#endif #ifdef PLATFORM_DRIVER platform_driver_unregister(&PLATFORM_DRIVER); #endif -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
