diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-14 17:47:23 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-14 17:47:23 +0000 |
| commit | b035c594aeb3e32adb3876ca6f40ee853601a500 (patch) | |
| tree | 4b895229bd97995009cbea08d920b359e3706df4 /target/linux/cns21xx/patches-3.7/104-cns21xx-usb-ehci-support.patch | |
| parent | f4802fa8bf397f32e246ccd7367ab4f037ca22dc (diff) | |
| download | mtk-20170518-b035c594aeb3e32adb3876ca6f40ee853601a500.zip mtk-20170518-b035c594aeb3e32adb3876ca6f40ee853601a500.tar.gz mtk-20170518-b035c594aeb3e32adb3876ca6f40ee853601a500.tar.bz2 | |
generic: add EHCI|OHCI platform driver fix from the cns21xx target
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35159
Diffstat (limited to 'target/linux/cns21xx/patches-3.7/104-cns21xx-usb-ehci-support.patch')
| -rw-r--r-- | target/linux/cns21xx/patches-3.7/104-cns21xx-usb-ehci-support.patch | 71 |
1 files changed, 14 insertions, 57 deletions
diff --git a/target/linux/cns21xx/patches-3.7/104-cns21xx-usb-ehci-support.patch b/target/linux/cns21xx/patches-3.7/104-cns21xx-usb-ehci-support.patch index 93f3c18..36fcd46 100644 --- a/target/linux/cns21xx/patches-3.7/104-cns21xx-usb-ehci-support.patch +++ b/target/linux/cns21xx/patches-3.7/104-cns21xx-usb-ehci-support.patch @@ -1,3 +1,17 @@ +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c +@@ -1269,6 +1269,11 @@ MODULE_LICENSE ("GPL"); + #define PLATFORM_DRIVER ehci_octeon_driver + #endif + ++#ifdef CONFIG_ARCH_CNS21XX ++#include "ehci-cns21xx.c" ++#define PLATFORM_DRIVER ehci_cns21xx_driver ++#endif ++ + #ifdef CONFIG_USB_CNS3XXX_EHCI + #include "ehci-cns3xxx.c" + #define PLATFORM_DRIVER cns3xxx_ehci_driver --- /dev/null +++ b/drivers/usb/host/ehci-cns21xx.c @@ -0,0 +1,186 @@ @@ -187,63 +201,6 @@ +}; + +MODULE_ALIAS("platform:" DRIVER_NAME); ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -1334,14 +1334,19 @@ MODULE_LICENSE ("GPL"); - #define PLATFORM_DRIVER ehci_hcd_sead3_driver - #endif - -+#ifdef CONFIG_ARCH_CNS21XX -+#include "ehci-cns21xx.c" -+#define PLATFORM_DRIVER ehci_cns21xx_driver -+#endif -+ - #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,10 +1406,21 @@ 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); */ -+ platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); - clean4: - #endif - #ifdef OF_PLATFORM_DRIVER -@@ -1435,6 +1451,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 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -376,6 +376,7 @@ config ARCH_CNS21XX |