usb: dwc_otg_310: support vbus controlled by both gpio and pmic

On some rockchip platforms (e.g. rk3368), usb vbus 5v is controlled
by both gpio and pmic at the same time. So we need to set gpio and
pmic when enable/disable usb vbus power.

Change-Id: I327a87f16662026eaab1b6577d0b0116c4b2671f
Signed-off-by: William Wu <wulf@rock-chips.com>

Author: wuliangfeng

drivers/usb/dwc_otg_310/usbdev_rk3036.c

@@ -185,13 +185,14 @@ static void usb20otg_power_enable(int enable)
 		/* disable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 0);
-		else if (usb20otg_get_status(USB_STATUS_BVABLID))
-			rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
+
+		rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
 	} else if (1 == enable) {
 		/* enable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 1);
-		else if (!usb20otg_get_status(USB_STATUS_BVABLID))
+
+		if (!usb20otg_get_status(USB_STATUS_BVABLID))
 			rk_battery_charger_detect_cb(USB_OTG_POWER_ON);
 	}
 }

drivers/usb/dwc_otg_310/usbdev_rk3126.c

@@ -194,13 +194,14 @@ static void usb20otg_power_enable(int enable)
 		/* disable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 0);
-		else if (usb20otg_get_status(USB_STATUS_BVABLID))
-			rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
+
+		rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
 	} else if (1 == enable) {
 		/* enable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 1);
-		else if (!usb20otg_get_status(USB_STATUS_BVABLID))
+
+		if (!usb20otg_get_status(USB_STATUS_BVABLID))
 			rk_battery_charger_detect_cb(USB_OTG_POWER_ON);
 	}
 }

drivers/usb/dwc_otg_310/usbdev_rk32.c

@@ -183,13 +183,14 @@ static void usb20otg_power_enable(int enable)
 		/* disable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 0);
-		else if (usb20otg_get_status(USB_STATUS_BVABLID))
-			rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
+
+		rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
 	} else if (1 == enable) {
 		/* enable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 1);
-		else if (!usb20otg_get_status(USB_STATUS_BVABLID))
+
+		if (!usb20otg_get_status(USB_STATUS_BVABLID))
 			rk_battery_charger_detect_cb(USB_OTG_POWER_ON);
 	}
 }

drivers/usb/dwc_otg_310/usbdev_rk3368.c

@@ -189,13 +189,14 @@ static void usb20otg_power_enable(int enable)
 		/* disable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 0);
-		else if (usb20otg_get_status(USB_STATUS_BVABLID))
-			rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
+
+		rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
 	} else if (1 == enable) {
 		/* enable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 1);
-		else if (!usb20otg_get_status(USB_STATUS_BVABLID))
+
+		if (!usb20otg_get_status(USB_STATUS_BVABLID))
 			rk_battery_charger_detect_cb(USB_OTG_POWER_ON);
 	}
 }