kernel: bump 4.14 to 4.14.66

[openwrt/staging/lynxis.git] / target / linux / ar71xx / patches-4.14 / 930-chipidea-pullup.patch

diff --git a/target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch b/target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch
index ee1e84bdd9f4ae6344b3fd7edd09e239429820bc..6e293305dbe1f5609db2ba4cd142d9c9ba1066b4 100644 (file)
--- a/target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch
+++ b/target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch
@@ -1,7 +1,5 @@
-Index: linux-4.14.61/drivers/usb/chipidea/ci.h
-===================================================================
---- linux-4.14.61.orig/drivers/usb/chipidea/ci.h
-+++ linux-4.14.61/drivers/usb/chipidea/ci.h
+--- a/drivers/usb/chipidea/ci.h
++++ b/drivers/usb/chipidea/ci.h
 @@ -205,6 +205,7 @@ struct hw_bank {
   * @in_lpm: if the core in low power mode
   * @wakeup_int: if wakeup interrupt occur
@@ -18,10 +16,8 @@ Index: linux-4.14.61/drivers/usb/chipidea/ci.h
  };
  
  static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci)
-Index: linux-4.14.61/drivers/usb/chipidea/core.c
-===================================================================
---- linux-4.14.61.orig/drivers/usb/chipidea/core.c
-+++ linux-4.14.61/drivers/usb/chipidea/core.c
+--- a/drivers/usb/chipidea/core.c
++++ b/drivers/usb/chipidea/core.c
 @@ -818,7 +818,7 @@ static inline void ci_role_destroy(struc
  {
        ci_hdrc_gadget_destroy(ci);
@@ -50,10 +46,8 @@ Index: linux-4.14.61/drivers/usb/chipidea/core.c
                ret = ci_hdrc_otg_init(ci);
                if (ret) {
                        dev_err(dev, "init otg fails, ret = %d\n", ret);
-Index: linux-4.14.61/drivers/usb/chipidea/otg.c
-===================================================================
---- linux-4.14.61.orig/drivers/usb/chipidea/otg.c
-+++ linux-4.14.61/drivers/usb/chipidea/otg.c
+--- a/drivers/usb/chipidea/otg.c
++++ b/drivers/usb/chipidea/otg.c
 @@ -131,8 +131,10 @@ enum ci_role ci_otg_role(struct ci_hdrc
  
  void ci_handle_vbus_change(struct ci_hdrc *ci)
@@ -66,10 +60,8 @@ Index: linux-4.14.61/drivers/usb/chipidea/otg.c
  
        if (hw_read_otgsc(ci, OTGSC_BSV) && !ci->vbus_active)
                usb_gadget_vbus_connect(&ci->gadget);
-Index: linux-4.14.61/include/linux/usb/chipidea.h
-===================================================================
---- linux-4.14.61.orig/include/linux/usb/chipidea.h
-+++ linux-4.14.61/include/linux/usb/chipidea.h
+--- a/include/linux/usb/chipidea.h
++++ b/include/linux/usb/chipidea.h
 @@ -60,6 +60,7 @@ struct ci_hdrc_platform_data {
  #define CI_HDRC_OVERRIDE_RX_BURST     BIT(11)
  #define CI_HDRC_OVERRIDE_PHY_CONTROL  BIT(12) /* Glue layer manages phy */