From c814af278a4f5a7c8e26f343eceacac3341c6b4b Mon Sep 17 00:00:00 2001 From: yangkai Date: Sat, 1 Sep 2012 17:30:24 +0800 Subject: [PATCH] rk3066b otg drv vbus conflict with pwm2 --- drivers/usb/dwc_otg/usbdev_rk30.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc_otg/usbdev_rk30.c b/drivers/usb/dwc_otg/usbdev_rk30.c index 819838baa291..c4ffc03832d9 100755 --- 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) // other haredware init #ifdef CONFIG_ARCH_RK3066B - rk30_mux_api_set(GPIO3D5_PWM2_JTAGTCK_OTGDRVVBUS_NAME, GPIO3D_OTGDRVVBUS); +// conflict with pwm2 +// rk30_mux_api_set(GPIO3D5_PWM2_JTAGTCK_OTGDRVVBUS_NAME, GPIO3D_OTGDRVVBUS); #else rk30_mux_api_set(GPIO0A5_OTGDRVVBUS_NAME, GPIO0A_OTG_DRV_VBUS); #endif -- 2.34.1