From 3d04dd4ebb7238758d446a8e9a7fff5b2cd7d740 Mon Sep 17 00:00:00 2001 From: wlf Date: Tue, 26 Mar 2013 21:11:10 +0800 Subject: [PATCH] USB: fix RK3188 usb20otg_hw_init --- drivers/usb/dwc_otg/dwc_otg_driver.c | 7 ------- drivers/usb/dwc_otg/usbdev_rk30.c | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/usb/dwc_otg/dwc_otg_driver.c b/drivers/usb/dwc_otg/dwc_otg_driver.c index a1e0fb187a55..358a633b6069 100755 --- a/drivers/usb/dwc_otg/dwc_otg_driver.c +++ b/drivers/usb/dwc_otg/dwc_otg_driver.c @@ -1159,13 +1159,6 @@ static __devinit int dwc_otg_driver_probe(struct platform_device *pdev) int irq; struct dwc_otg_platform_data *pldata = dev->platform_data; - -#ifdef CONFIG_ARCH_RK3188 - unsigned int * USB_GRF_UOC0_CON0 = (unsigned int*)(RK30_GRF_BASE+0x10c); - /* usb phy enter usb mode */ - * USB_GRF_UOC0_CON0 = (0x0300 << 16); -#endif - // clock and hw init if(pldata->hw_init) pldata->hw_init(); diff --git a/drivers/usb/dwc_otg/usbdev_rk30.c b/drivers/usb/dwc_otg/usbdev_rk30.c index 3d19f1a5b360..a601d6e5c462 100755 --- a/drivers/usb/dwc_otg/usbdev_rk30.c +++ b/drivers/usb/dwc_otg/usbdev_rk30.c @@ -121,7 +121,11 @@ void usb20otg_hw_init(void) #endif #endif // usb phy config init - +#ifdef CONFIG_ARCH_RK3188 + //usb phy enter usb mode + unsigned int * otg_phy_con3 = (unsigned int*)(USBGRF_UOC0_CON0); + *otg_phy_con3 = (0x0300 << 16); +#endif // other haredware init #if defined(CONFIG_ARCH_RK3066B) || defined(CONFIG_ARCH_RK3188) //GPIO init -- 2.34.1