X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=drivers%2Fusb%2Fhost%2Fehci-hcd.c;h=b65c8dc53ae6e3729d5c02a85f533889cc299784;hp=f1c3ad69ca54a907b99c82cdf63cdf20129bda55;hb=5013a8fe9733d7906daf046cd164bb2028a63fea;hpb=1f8fdf83fe376cc83e96e942689a6cfac01e9634

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index f1c3ad69ca54..b65c8dc53ae6 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1271,6 +1271,11 @@ MODULE_LICENSE ("GPL");
 #define	PLATFORM_DRIVER		ehci_hcd_tilegx_driver
 #endif
 
+#ifdef CONFIG_USB_EHCI1_RK
+#include "ehci1-rockchip.c"
+#define ROCKCHIP_PLATFORM_DRIVER	ehci1_rk_driver
+#endif
+
 #ifdef CONFIG_USB_EHCI_HCD_PMC_MSP
 #include "ehci-pmcmsp.c"
 #define	PLATFORM_DRIVER		ehci_hcd_msp_driver
@@ -1346,8 +1351,19 @@ static int __init ehci_hcd_init(void)
 	if (retval < 0)
 		goto clean4;
 #endif
+
+#ifdef ROCKCHIP_PLATFORM_DRIVER
+	retval = platform_driver_register(&ROCKCHIP_PLATFORM_DRIVER);
+	if (retval < 0)
+		goto clean5;
+#endif
 	return retval;
 
+#ifdef ROCKCHIP_PLATFORM_DRIVER
+	platform_driver_unregister(&ROCKCHIP_PLATFORM_DRIVER);
+clean5:
+#endif
+
 #ifdef XILINX_OF_PLATFORM_DRIVER
 	/* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */
 clean4:
@@ -1376,6 +1392,9 @@ module_init(ehci_hcd_init);
 
 static void __exit ehci_hcd_cleanup(void)
 {
+#ifdef ROCKCHIP_PLATFORM_DRIVER
+	platform_driver_unregister(&ROCKCHIP_PLATFORM_DRIVER);
+#endif
 #ifdef XILINX_OF_PLATFORM_DRIVER
 	platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
 #endif