X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=drivers%2Fusb%2Fdwc_otg_310%2Fdwc_otg_driver.c;h=4463f1bb35d2e393f92dd24cdcb19d67559b0afb;hp=eaf6772c9c1818391c5a4746d3b67e3140870b3e;hb=ec42359f2660cfd0afa81c4e38b9e3695a1828a0;hpb=1d25707ec252866943bb1b4e248dacfb7a3027d0

diff --git a/drivers/usb/dwc_otg_310/dwc_otg_driver.c b/drivers/usb/dwc_otg_310/dwc_otg_driver.c
index eaf6772c9c18..4463f1bb35d2 100644
--- a/drivers/usb/dwc_otg_310/dwc_otg_driver.c
+++ b/drivers/usb/dwc_otg_310/dwc_otg_driver.c
@@ -352,13 +352,21 @@ extern void dwc_otg_hub_disconnect_device(struct usb_hub *hub);
 void dwc_otg_force_host(dwc_otg_core_if_t *core_if)
 {
 	dwc_otg_device_t *otg_dev = core_if->otg_dev;
+	struct dwc_otg_platform_data *pdata = otg_dev->pldata;
 	dctl_data_t dctl = {.d32 = 0 };
 	unsigned long flags;
 
 	if (core_if->op_state == A_HOST) {
-		printk("dwc_otg_force_host,already in A_HOST mode,everest\n");
+		dev_info(pdata->dev,
+			 "dwc_otg_force_host,already in A_HOST mode,everest\n");
+		return;
+	} else if (pdata->get_status(USB_STATUS_BVABLID) &&
+		   core_if->pmic_vbus) {
+		dev_info(pdata->dev,
+			 "Please disconnect the USB cable first, and try again!\n");
 		return;
 	}
+
 	core_if->op_state = A_HOST;
 
 	cancel_delayed_work(&otg_dev->pcd->check_vbus_work);
@@ -386,6 +394,7 @@ void dwc_otg_force_device(dwc_otg_core_if_t *core_if)
 	local_irq_save(flags);
 
 	if (core_if->op_state == B_PERIPHERAL) {
+		local_irq_restore(flags);
 		printk
 		    ("dwc_otg_force_device,already in B_PERIPHERAL,everest\n");
 		return;
@@ -1503,6 +1512,10 @@ static int otg20_driver_probe(struct platform_device *_dev)
 	of_property_read_u32(node, "rockchip,usb-mode", &val);
 	dwc_otg_device->core_if->usb_mode = val;
 
+	/* Indicate usb vbus get from pmic (e.g. rk81x) */
+	dwc_otg_device->core_if->pmic_vbus = of_property_read_bool(node,
+						"rockchip,usb-pmic-vbus");
+
 #ifndef DWC_HOST_ONLY
 	/*
 	 * Initialize the PCD
@@ -1620,12 +1633,14 @@ static struct platform_driver dwc_otg_driver = {
 void rk_usb_power_up(void)
 {
 	struct dwc_otg_platform_data *pldata_otg;
+#ifdef CONFIG_USB20_HOST
 	struct dwc_otg_platform_data *pldata_host;
+#endif
 #ifdef CONFIG_USB_EHCI_RK
 	struct rkehci_platform_data *pldata_ehci;
 #endif
 
-	if (cpu_is_rk3288()) {
+	if (is_rk3288_usb()) {
 #ifdef CONFIG_RK_USB_UART
 		/* enable USB bypass UART function  */
 		writel_relaxed(0x00c00000 | usb_to_uart_status,
@@ -1676,12 +1691,14 @@ void rk_usb_power_up(void)
 void rk_usb_power_down(void)
 {
 	struct dwc_otg_platform_data *pldata_otg;
+#ifdef CONFIG_USB20_HOST
 	struct dwc_otg_platform_data *pldata_host;
+#endif
 #ifdef CONFIG_USB_EHCI_RK
 	struct rkehci_platform_data *pldata_ehci;
 #endif
 
-	if (cpu_is_rk3288()) {
+	if (is_rk3288_usb()) {
 #ifdef CONFIG_RK_USB_UART
 		/* disable USB bypass UART function */
 		usb_to_uart_status =