kernel: bump 4.14 to 4.14.128

[openwrt/staging/blogic.git] / target / linux / generic / backport-4.14 / 030-v4.17-0001-usb-dwc2-add-support-for-host-mode-external-vbus-sup.patch

diff --git a/target/linux/generic/backport-4.14/030-v4.17-0001-usb-dwc2-add-support-for-host-mode-external-vbus-sup.patch b/target/linux/generic/backport-4.14/030-v4.17-0001-usb-dwc2-add-support-for-host-mode-external-vbus-sup.patch
index a17844f5e637adbfb850011870464f1dd30733c3..4d029ebfe239092acbf4e8fb2c72ad27371d30a9 100644 (file)
--- a/target/linux/generic/backport-4.14/030-v4.17-0001-usb-dwc2-add-support-for-host-mode-external-vbus-sup.patch
+++ b/target/linux/generic/backport-4.14/030-v4.17-0001-usb-dwc2-add-support-for-host-mode-external-vbus-sup.patch
@@ -63,7 +63,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
  /**
   * dwc2_enable_host_interrupts() - Enables the Host mode interrupts
   *
-@@ -3342,6 +3359,7 @@ static void dwc2_conn_id_status_change(s
+@@ -3346,6 +3363,7 @@ static void dwc2_conn_id_status_change(s
  
        /* B-Device connector (Device Mode) */
        if (gotgctl & GOTGCTL_CONID_B) {
@@ -71,7 +71,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
                /* Wait for switch to device mode */
                dev_dbg(hsotg->dev, "connId B\n");
                if (hsotg->bus_suspended) {
-@@ -4448,6 +4466,9 @@ static int _dwc2_hcd_start(struct usb_hc
+@@ -4455,6 +4473,9 @@ static int _dwc2_hcd_start(struct usb_hc
        }
  
        spin_unlock_irqrestore(&hsotg->lock, flags);
@@ -81,7 +81,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
        return 0;
  }
  
-@@ -4475,6 +4496,8 @@ static void _dwc2_hcd_stop(struct usb_hc
+@@ -4482,6 +4503,8 @@ static void _dwc2_hcd_stop(struct usb_hc
        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
        spin_unlock_irqrestore(&hsotg->lock, flags);
  
@@ -90,7 +90,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
        usleep_range(1000, 3000);
  }
  
-@@ -4511,6 +4534,7 @@ static int _dwc2_hcd_suspend(struct usb_
+@@ -4518,6 +4541,7 @@ static int _dwc2_hcd_suspend(struct usb_
                hprt0 |= HPRT0_SUSP;
                hprt0 &= ~HPRT0_PWR;
                dwc2_writel(hprt0, hsotg->regs + HPRT0);
@@ -98,7 +98,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
        }
  
        /* Enter hibernation */
-@@ -4591,6 +4615,8 @@ static int _dwc2_hcd_resume(struct usb_h
+@@ -4598,6 +4622,8 @@ static int _dwc2_hcd_resume(struct usb_h
                spin_unlock_irqrestore(&hsotg->lock, flags);
                dwc2_port_resume(hsotg);
        } else {