usb: phy: msm: Fix PTS definitions for MSM USB controller

Fix the value used for Parallel Transceiver Select (PTS) for the MSM USB
controller.  This is a standard chipidea PORTSC definition, where
a PHY_TYPE of 10b (<<30) is ULPI and 11b (<<30) is SERIAL.
Fix the definitions and use them correctly in the driver code.

Signed-off-by: Tim Bird <tim.bird@sonymobile.com>
Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index bb339963f8bb1327497fef3549392762178b11d0..db8d963776202897968b51b11ab902c4e9f5db20 100644 (file)
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -287,8 +287,9 @@ static int msm_link_reset(struct msm_otg *motg)
        if (motg->phy_number)
                writel(readl(USB_PHY_CTRL2) | BIT(16), USB_PHY_CTRL2);
 
+       /* put transceiver in serial mode as part of reset */
        val = readl(USB_PORTSC) & ~PORTSC_PTS_MASK;
-       writel(val | PORTSC_PTS_ULPI, USB_PORTSC);
+       writel(val | PORTSC_PTS_SERIAL, USB_PORTSC);
 
        return 0;
 }
@@ -308,8 +309,9 @@ static int msm_otg_reset(struct usb_phy *phy)
        if (cnt >= LINK_RESET_TIMEOUT_USEC)
                return -ETIMEDOUT;
 
-       /* select ULPI phy */
-       writel(0x80000000, USB_PORTSC);
+       /* select ULPI phy and clear other status/control bits in PORTSC */
+       writel(PORTSC_PTS_ULPI, USB_PORTSC);
+
        writel(0x0, USB_AHBBURST);
        writel(0x08, USB_AHBMODE);
 

diff --git a/include/linux/usb/msm_hsusb_hw.h b/include/linux/usb/msm_hsusb_hw.h
index 575c74397e52953ab5655ad2e0c88ecba5b35389..98d3dd8976e5bf20265b7df95a0e35d67d040e44 100644 (file)
--- a/include/linux/usb/msm_hsusb_hw.h
+++ b/include/linux/usb/msm_hsusb_hw.h
@@ -31,8 +31,9 @@
 #define USB_USBINTR          (MSM_USB_BASE + 0x0148)
 
 #define PORTSC_PHCD            (1 << 23) /* phy suspend mode */
-#define PORTSC_PTS_MASK         (3 << 30)
-#define PORTSC_PTS_ULPI         (3 << 30)
+#define PORTSC_PTS_MASK        (3 << 30)
+#define PORTSC_PTS_ULPI        (2 << 30)
+#define PORTSC_PTS_SERIAL      (3 << 30)
 
 #define USB_ULPI_VIEWPORT    (MSM_USB_BASE + 0x0170)
 #define ULPI_RUN              (1 << 30)