Merge pull request torvalds#83 from miodragdinic/ci20-v3.18-dwc2-fixes

Ci20 v3.18 dwc2 fixes

Author: ZubairLK

arch/mips/boot/dts/jz4780.dtsi

@@ -770,6 +770,7 @@
 
 			phys = <&usb_phy>;
 			phy-names = "usb2-phy";
+			g-rx-fifo-size = <256>;
 			g-tx-fifo-size = <256 256 256 256>;
 		};
 	};

arch/mips/configs/ci20_defconfig

@@ -716,6 +716,7 @@ CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
 CONFIG_USBIP_HOST=m
 CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_DISABLE_VOD=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRCABLE=m

drivers/usb/dwc2/Kconfig

@@ -97,4 +97,10 @@ config USB_DWC2_DEBUG_PERIODIC
 	  non-periodic transfers, but of course the debug logs will be
 	  incomplete. Note that this also disables some debug messages
 	  for which the transfer type cannot be deduced.
+
+config USB_DWC2_DISABLE_VOD
+	bool "Disable VBUS overcurrent detection"
+	help
+	  Say Y here to switch off VBUS overcurrent detection. It enables USB
+	  functionality blocked by overcurrent detection.
 endif

drivers/usb/dwc2/core.c

@@ -715,6 +715,13 @@ void dwc2_core_host_init(struct dwc2_hsotg *hsotg)
 	otgctl &= ~GOTGCTL_HSTSETHNPEN;
 	writel(otgctl, hsotg->regs + GOTGCTL);
 
+#ifdef CONFIG_USB_DWC2_DISABLE_VOD
+	otgctl = readl(hsotg->regs + GOTGCTL);
+	otgctl |= GOTGCTL_VB_VALID_OV_VAL;
+	otgctl |= GOTGCTL_VB_VALID_OV_EN;
+	writel(otgctl, hsotg->regs + GOTGCTL);
+#endif
+
 	if (hsotg->core_params->dma_desc_enable <= 0) {
 		int num_channels, i;
 		u32 hcchar;

drivers/usb/dwc2/hcd_intr.c

@@ -350,6 +350,9 @@ static void dwc2_port_intr(struct dwc2_hsotg *hsotg)
 		dev_vdbg(hsotg->dev,
 			 "--Port Interrupt HPRT0=0x%08x Port Connect Detected--\n",
 			 hprt0);
+		if (hsotg->lx_state != DWC2_L0)
+			usb_hcd_resume_root_hub(hsotg->priv);
+
 		hsotg->flags.b.port_connect_status_change = 1;
 		hsotg->flags.b.port_connect_status = 1;
 		hprt0_modify |= HPRT0_CONNDET;

drivers/usb/dwc2/hw.h

@@ -52,6 +52,8 @@
 #define GOTGCTL_HSTSETHNPEN		(1 << 10)
 #define GOTGCTL_HNPREQ			(1 << 9)
 #define GOTGCTL_HSTNEGSCS		(1 << 8)
+#define GOTGCTL_VB_VALID_OV_VAL		(1 << 3)
+#define GOTGCTL_VB_VALID_OV_EN		(1 << 2)
 #define GOTGCTL_SESREQ			(1 << 1)
 #define GOTGCTL_SESREQSCS		(1 << 0)