rk3066b otg drv vbus conflict with pwm2

diff --git a/drivers/usb/dwc_otg/usbdev_rk30.c b/drivers/usb/dwc_otg/usbdev_rk30.c
index 819838baa2917b7344ea8b5ecc6c3303abd9e3f2..c4ffc03832d959e819f5072f80d157786cf01184 100755 (executable)
--- a/drivers/usb/dwc_otg/usbdev_rk30.c
+++ b/drivers/usb/dwc_otg/usbdev_rk30.c
@@ -52,7 +52,8 @@ void usb20otg_hw_init(void)
 \r
     // other haredware init\r
 #ifdef CONFIG_ARCH_RK3066B\r
-    rk30_mux_api_set(GPIO3D5_PWM2_JTAGTCK_OTGDRVVBUS_NAME, GPIO3D_OTGDRVVBUS);\r
+//  conflict with pwm2\r
+//    rk30_mux_api_set(GPIO3D5_PWM2_JTAGTCK_OTGDRVVBUS_NAME, GPIO3D_OTGDRVVBUS);\r
 #else\r
     rk30_mux_api_set(GPIO0A5_OTGDRVVBUS_NAME, GPIO0A_OTG_DRV_VBUS);\r
 #endif\r