usb: fix conflict for kernel minor update 4.14.113

Change-Id: Ic12745e3230499c6ab57cfa51a0ac34ce38d8037
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 7bb13ebbdfa8603a3b43d5678013284d3cf211ca..4b81d00f18c58995196f0ad72c6f01c396e189a0 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -984,33 +984,15 @@ int dwc3_core_init(struct dwc3 *dwc)
                        dwc->maximum_speed = USB_SPEED_HIGH;
        }
 
-<<<<<<< HEAD
-       ret = dwc3_core_get_phy(dwc);
-       if (ret) {
-               dev_err(dwc->dev, "Can't get PHY structure!!!\n");
-=======
-       ret = dwc3_phy_setup(dwc);
-       if (ret)
->>>>>>> android-4.14-p
-               goto err0;
-       }
-
        /* Adjust SOF accuracy only for revisions >= 2.50a */
        if (dwc->revision < DWC3_REVISION_250A)
                dwc->adj_sof_accuracy = 0;
 
-<<<<<<< HEAD
-       ret = dwc3_core_soft_reset(dwc);
-       if (ret) {
-               dev_err(dwc->dev, "Can't core_soft_reset!!!(%d)\n", ret);
-               goto err0;
-=======
        if (!dwc->ulpi_ready) {
                ret = dwc3_core_ulpi_init(dwc);
                if (ret)
                        goto err0;
                dwc->ulpi_ready = true;
->>>>>>> android-4.14-p
        }
 
        if (!dwc->phys_ready) {
@@ -1116,16 +1098,13 @@ err1:
        phy_exit(dwc->usb2_generic_phy);
        phy_exit(dwc->usb3_generic_phy);
 
-<<<<<<< HEAD
        phy_power_off(dwc->usb2_generic_phy);
        phy_power_off(dwc->usb3_generic_phy);
 
        dwc->link_state = DWC3_LINK_STATE_SS_DIS;
-=======
 err0a:
        dwc3_ulpi_exit(dwc);
 
->>>>>>> android-4.14-p
 err0:
        return ret;
 }

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 1f6ccff39ed83dcd1aded5b1eeb56fc152586e36..52974a3e4637ff6e4ab35bf0e098eb7e9c3428c5 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1579,10 +1579,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
                else
                        dep->flags |= DWC3_EP_STALL;
        } else {
-<<<<<<< HEAD
-=======
-
->>>>>>> android-4.14-p
                ret = dwc3_send_clear_stall_ep_cmd(dep);
                if (ret)
                        dev_err(dwc->dev, "failed to clear STALL on %s\n",
@@ -3745,7 +3741,6 @@ int dwc3_gadget_init(struct dwc3 *dwc)
                goto err4;
        }
 
-<<<<<<< HEAD
        if (dwc->dotg) {
                ret = otg_set_peripheral(&dwc->dotg->otg, &dwc->gadget);
                if (ret) {
@@ -3753,9 +3748,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
                        goto err4;
                }
        }
-=======
-       dwc3_gadget_set_speed(&dwc->gadget, dwc->maximum_speed);
->>>>>>> android-4.14-p
+
+       /* Kernel minor update
+        * dwc3_gadget_set_speed(&dwc->gadget, dwc->maximum_speed);
+        */
 
        return 0;
 

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index d5979b7c43036389f29ec4aa98c494a7c2b26c66..d4f3d35e0291ef2096720d30b79c29fb5117d3aa 100644 (file)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -1516,13 +1516,9 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
        __le32 __iomem **port_array;
        struct xhci_bus_state *bus_state;
        unsigned long flags;
-<<<<<<< HEAD
        int is_port_connect = 0;
-       int ret;
-=======
        u32 portsc_buf[USB_MAXCHILDREN];
        bool wake_enabled;
->>>>>>> android-4.14-p
 
        max_ports = xhci_get_ports(hcd, &port_array);
        bus_state = &xhci->bus_state[hcd_index(hcd)];
@@ -1551,12 +1547,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
                t2 = xhci_port_state_to_neutral(t1);
                portsc_buf[port_index] = 0;
 
-<<<<<<< HEAD
-               if ((t1 & PORT_PE) && !(t1 & PORT_PLS_MASK)) {
-                       slot_id = xhci_find_slot_id_by_port(hcd, xhci,
-                                       port_index + 1);
-                       if (slot_id) {
-=======
                /* Bail out if a USB3 port has a new device in link training */
                if ((hcd->speed >= HCD_USB3) &&
                    (t1 & PORT_PLS_MASK) == XDEV_POLLING) {
@@ -1570,7 +1560,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
                if ((t1 & PORT_PE) && (t1 & PORT_PLS_MASK) == XDEV_U0) {
                        if ((t1 & PORT_CSC) && wake_enabled) {
                                bus_state->bus_suspended = 0;
->>>>>>> android-4.14-p
                                spin_unlock_irqrestore(&xhci->lock, flags);
                                xhci_dbg(xhci, "Bus suspend bailout, port connect change\n");
                                return -EBUSY;
@@ -1598,21 +1587,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
                }
 
                t1 = xhci_port_state_to_neutral(t1);
-<<<<<<< HEAD
-               if (t1 != t2) {
-                       writel(t2, port_array[port_index]);
-               }
-       }
-
-       if (is_port_connect && usb_hcd_is_primary_hcd(hcd)) {
-               xhci_info(xhci, "port is connected, phy vendor set\n");
-               ret = phy_vendor_set(xhci->main_hcd->phy, 1, 0);
-               if (ret) {
-                       xhci_info(xhci, "phy vendor set fail\n");
-                       spin_unlock_irqrestore(&xhci->lock, flags);
-                       return ret;
-               }
-=======
                if (t1 != t2)
                        portsc_buf[port_index] = t2;
        }
@@ -1634,7 +1608,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
                        }
                }
                writel(portsc_buf[port_index], port_array[port_index]);
->>>>>>> android-4.14-p
        }
 
        xhci_info(xhci, "%s 'HC_STATE_SUSPENDED' portcon: %d primary_hcd: %d\n",

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index e21779e21133b403aa7f116624dae11d9420d2e5..d4feb34fc7a41e8929393ac0321e7a474e4cf912 100755 (executable)
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -542,7 +542,7 @@ static int xhci_plat_remove(struct platform_device *dev)
        struct usb_hcd  *hcd = platform_get_drvdata(dev);
        struct xhci_hcd *xhci = hcd_to_xhci(hcd);
        struct clk *clk = xhci->clk;
-<<<<<<< HEAD
+       struct usb_hcd *shared_hcd = xhci->shared_hcd;
        int timeout = 0;
 
        dev_info(&dev->dev, "XHCI PLAT REMOVE\n");
@@ -564,9 +564,6 @@ static int xhci_plat_remove(struct platform_device *dev)
                }
        }
        xhci_dbg(xhci, "%s: waited %dmsec", __func__, timeout);
-=======
-       struct usb_hcd *shared_hcd = xhci->shared_hcd;
->>>>>>> android-4.14-p
 
        xhci->xhc_state |= XHCI_STATE_REMOVING;
        xhci->xhci_alloc->offset = 0;

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 82ffda77f390336d247cc33bd5489156c8721979..d494eebe39b2b048b2387a1fbd4ec50fce569de8 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1858,14 +1858,6 @@ struct xhci_hcd {
 #define XHCI_NO_64BIT_SUPPORT  BIT_ULL(23)
 #define XHCI_MISSING_CAS       BIT_ULL(24)
 /* For controller with a broken Port Disable implementation */
-<<<<<<< HEAD
-#define XHCI_BROKEN_PORT_PED   (1 << 25)
-#define XHCI_LIMIT_ENDPOINT_INTERVAL_7 (1 << 26)
-#define XHCI_U2_DISABLE_WAKE   (1 << 27)
-#define XHCI_ASMEDIA_MODIFY_FLOWCONTROL        (1 << 28)
-#define XHCI_L2_SUPPORT        (1 << 29)
-#define XHCI_SUSPEND_DELAY     (1 << 30)
-=======
 #define XHCI_BROKEN_PORT_PED   BIT_ULL(25)
 #define XHCI_LIMIT_ENDPOINT_INTERVAL_7 BIT_ULL(26)
 #define XHCI_U2_DISABLE_WAKE   BIT_ULL(27)
@@ -1875,7 +1867,7 @@ struct xhci_hcd {
 #define XHCI_INTEL_USB_ROLE_SW BIT_ULL(31)
 #define XHCI_RESET_PLL_ON_DISCONNECT   BIT_ULL(34)
 #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)
->>>>>>> android-4.14-p
+#define XHCI_L2_SUPPORT                 BIT_ULL(63)
 
        unsigned int            num_active_eps;
        unsigned int            limit_active_eps;