From: Tim Bird <[email protected]>
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 <[email protected]>
---
drivers/usb/phy/phy-msm-usb.c | 8 +++++---
include/linux/usb/msm_hsusb_hw.h | 5 +++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index d949018..06d79c1 100644
--- 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 575c743..98d3dd8 100644
--- 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)
--
1.8.3.2
On Thu, Apr 24, 2014 at 06:48:11PM +0300, Ivan T. Ivanov wrote:
> From: Tim Bird <[email protected]>
>
> 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 <[email protected]>
since you're the one sending the patch, you must add your signed-off-by
too. If you reply with your SoB I'll add to proper patches.
--
balbi
Signed-off-by:Tim Bird <[email protected]>
Sent from my Sony Xperia™ smartphone
---- Felipe Balbi wrote ----
>On Thu, Apr 24, 2014 at 06:48:11PM +0300, Ivan T. Ivanov wrote:
>> From: Tim Bird <[email protected]>
>>
>> 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 <[email protected]>
>
>since you're the one sending the patch, you must add your signed-off-by
>too. If you reply with your SoB I'll add to proper patches.
>
>--
>balbi
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay? ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?
Hi,
On Wed, Apr 30, 2014 at 08:07:05PM +0200, Bird, Tim wrote:
> Signed-off-by:Tim Bird <[email protected]>
thanks Tim but I already had your SoB in the patch, I need Ivan's :-)
>
> Sent from my Sony Xperia™ smartphone
>
> ---- Felipe Balbi wrote ----
>
> >On Thu, Apr 24, 2014 at 06:48:11PM +0300, Ivan T. Ivanov wrote:
> >> From: Tim Bird <[email protected]>
> >>
> >> 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 <[email protected]>
> >
> >since you're the one sending the patch, you must add your signed-off-by
> >too. If you reply with your SoB I'll add to proper patches.
--
balbi