generic: add EHCI|OHCI platform driver fix to 3.[36]

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35194 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/patches-3.3/800-usb-ohci-multiple-platform-driver-fix.patch b/target/linux/generic/patches-3.3/800-usb-ohci-multiple-platform-driver-fix.patch
new file mode 100644 (file)
index 0000000..a2a213b
--- /dev/null
+++ b/target/linux/generic/patches-3.3/800-usb-ohci-multiple-platform-driver-fix.patch
@@ -0,0 +1,51 @@
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -1123,7 +1123,7 @@ MODULE_LICENSE ("GPL");
+ 
+ #ifdef CONFIG_USB_OHCI_HCD_PLATFORM
+ #include "ohci-platform.c"
+-#define PLATFORM_DRIVER               ohci_platform_driver
++#define OHCI_PLATFORM_DRIVER          ohci_platform_driver
+ #endif
+ 
+ #if   !defined(PCI_DRIVER) &&         \
+@@ -1135,7 +1135,8 @@ MODULE_LICENSE ("GPL");
+       !defined(PS3_SYSTEM_BUS_DRIVER) && \
+       !defined(SM501_OHCI_DRIVER) && \
+       !defined(TMIO_OHCI_DRIVER) && \
+-      !defined(SSB_OHCI_DRIVER)
++      !defined(SSB_OHCI_DRIVER) && \
++      !defined(OHCI_PLATFORM_DRIVER)
+ #error "missing bus glue for ohci-hcd"
+ #endif
+ 
+@@ -1219,9 +1220,19 @@ static int __init ohci_hcd_mod_init(void
+               goto error_tmio;
+ #endif
+ 
++#ifdef OHCI_PLATFORM_DRIVER
++      retval = platform_driver_register(&OHCI_PLATFORM_DRIVER);
++      if (retval < 0)
++              goto error_ohci;
++#endif
++
+       return retval;
+ 
+       /* Error path */
++#ifdef OHCI_PLATFORM_DRIVER
++      platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
++ error_ohci:
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+       platform_driver_unregister(&TMIO_OHCI_DRIVER);
+  error_tmio:
+@@ -1275,6 +1286,9 @@ module_init(ohci_hcd_mod_init);
+ 
+ static void __exit ohci_hcd_mod_exit(void)
+ {
++#ifdef OHCI_PLATFORM_DRIVER
++      platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+       platform_driver_unregister(&TMIO_OHCI_DRIVER);
+ #endif

diff --git a/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch b/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch
new file mode 100644 (file)
index 0000000..9bf5097
--- /dev/null
+++ b/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch
@@ -0,0 +1,47 @@
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -1383,12 +1383,12 @@ MODULE_LICENSE ("GPL");
+ 
+ #ifdef CONFIG_USB_EHCI_HCD_PLATFORM
+ #include "ehci-platform.c"
+-#define PLATFORM_DRIVER               ehci_platform_driver
++#define EHCI_PLATFORM_DRIVER  ehci_platform_driver
+ #endif
+ 
+ #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
+     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
+-    !defined(XILINX_OF_PLATFORM_DRIVER)
++    !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER)
+ #error "missing bus glue for ehci-hcd"
+ #endif
+ 
+@@ -1448,8 +1448,19 @@ static int __init ehci_hcd_init(void)
+       if (retval < 0)
+               goto clean4;
+ #endif
++
++#ifdef EHCI_PLATFORM_DRIVER
++      retval = platform_driver_register(&EHCI_PLATFORM_DRIVER);
++      if (retval < 0)
++              goto clean5;
++#endif
++
+       return retval;
+ 
++#ifdef EHCI_PLATFORM_DRIVER
++      platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
++clean5:
++#endif
+ #ifdef XILINX_OF_PLATFORM_DRIVER
+       /* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */
+ clean4:
+@@ -1482,6 +1493,9 @@ module_init(ehci_hcd_init);
+ 
+ static void __exit ehci_hcd_cleanup(void)
+ {
++#ifdef EHCI_PLATFORM_DRIVER
++      platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
++#endif
+ #ifdef XILINX_OF_PLATFORM_DRIVER
+       platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
+ #endif

diff --git a/target/linux/generic/patches-3.6/800-usb-ohci-multiple-platform-driver-fix.patch b/target/linux/generic/patches-3.6/800-usb-ohci-multiple-platform-driver-fix.patch
new file mode 100644 (file)
index 0000000..11075d5
--- /dev/null
+++ b/target/linux/generic/patches-3.6/800-usb-ohci-multiple-platform-driver-fix.patch
@@ -0,0 +1,51 @@
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -1117,7 +1117,7 @@ MODULE_LICENSE ("GPL");
+ 
+ #ifdef CONFIG_USB_OHCI_HCD_PLATFORM
+ #include "ohci-platform.c"
+-#define PLATFORM_DRIVER               ohci_platform_driver
++#define OHCI_PLATFORM_DRIVER          ohci_platform_driver
+ #endif
+ 
+ #if   !defined(PCI_DRIVER) &&         \
+@@ -1128,7 +1128,8 @@ MODULE_LICENSE ("GPL");
+       !defined(SA1111_DRIVER) &&      \
+       !defined(PS3_SYSTEM_BUS_DRIVER) && \
+       !defined(SM501_OHCI_DRIVER) && \
+-      !defined(TMIO_OHCI_DRIVER)
++      !defined(TMIO_OHCI_DRIVER) && \
++      !defined(OHCI_PLATFORM_DRIVER)
+ #error "missing bus glue for ohci-hcd"
+ #endif
+ 
+@@ -1206,9 +1207,19 @@ static int __init ohci_hcd_mod_init(void
+               goto error_tmio;
+ #endif
+ 
++#ifdef OHCI_PLATFORM_DRIVER
++      retval = platform_driver_register(&OHCI_PLATFORM_DRIVER);
++      if (retval < 0)
++              goto error_ohci;
++#endif
++
+       return retval;
+ 
+       /* Error path */
++#ifdef OHCI_PLATFORM_DRIVER
++      platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
++ error_ohci:
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+       platform_driver_unregister(&TMIO_OHCI_DRIVER);
+  error_tmio:
+@@ -1258,6 +1269,9 @@ module_init(ohci_hcd_mod_init);
+ 
+ static void __exit ohci_hcd_mod_exit(void)
+ {
++#ifdef OHCI_PLATFORM_DRIVER
++      platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
++#endif
+ #ifdef TMIO_OHCI_DRIVER
+       platform_driver_unregister(&TMIO_OHCI_DRIVER);
+ #endif

diff --git a/target/linux/generic/patches-3.6/801-usb-ehci-multiple-platform-driver-fix.patch b/target/linux/generic/patches-3.6/801-usb-ehci-multiple-platform-driver-fix.patch
new file mode 100644 (file)
index 0000000..e803044
--- /dev/null
+++ b/target/linux/generic/patches-3.6/801-usb-ehci-multiple-platform-driver-fix.patch
@@ -0,0 +1,47 @@
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -1336,12 +1336,12 @@ MODULE_LICENSE ("GPL");
+ 
+ #ifdef CONFIG_USB_EHCI_HCD_PLATFORM
+ #include "ehci-platform.c"
+-#define PLATFORM_DRIVER               ehci_platform_driver
++#define EHCI_PLATFORM_DRIVER  ehci_platform_driver
+ #endif
+ 
+ #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
+     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
+-    !defined(XILINX_OF_PLATFORM_DRIVER)
++    !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER)
+ #error "missing bus glue for ehci-hcd"
+ #endif
+ 
+@@ -1401,8 +1401,19 @@ static int __init ehci_hcd_init(void)
+       if (retval < 0)
+               goto clean4;
+ #endif
++
++#ifdef EHCI_PLATFORM_DRIVER
++      retval = platform_driver_register(&EHCI_PLATFORM_DRIVER);
++      if (retval < 0)
++              goto clean5;
++#endif
++
+       return retval;
+ 
++#ifdef EHCI_PLATFORM_DRIVER
++      platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
++clean5:
++#endif
+ #ifdef XILINX_OF_PLATFORM_DRIVER
+       /* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */
+ clean4:
+@@ -1435,6 +1446,9 @@ module_init(ehci_hcd_init);
+ 
+ static void __exit ehci_hcd_cleanup(void)
+ {
++#ifdef EHCI_PLATFORM_DRIVER
++      platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
++#endif
+ #ifdef XILINX_OF_PLATFORM_DRIVER
+       platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
+ #endif