diff mbox

[v7,16/20] usb: phy: msm: Fix PTS definitions for MSM USB controller

Message ID 1398354495-20782-17-git-send-email-iivanov@mm-sol.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Ivan T. Ivanov April 24, 2014, 3:48 p.m. UTC
From: Tim Bird <tbird20d@gmail.com>

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>
---
 drivers/usb/phy/phy-msm-usb.c    | 8 +++++---
 include/linux/usb/msm_hsusb_hw.h | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

--
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Felipe Balbi April 30, 2014, 4:27 p.m. UTC | #1
On Thu, Apr 24, 2014 at 06:48:11PM +0300, Ivan T. Ivanov wrote:
> From: Tim Bird <tbird20d@gmail.com>
> 
> 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>

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.
Bird, Tim April 30, 2014, 6:07 p.m. UTC | #2
U2lnbmVkLW9mZi1ieTpUaW0gQmlyZCA8VGltLmJpcmRAc29ueW1vYmlsZS5jb20+CgpTZW50IGZy
b20gbXkgU29ueSBYcGVyaWHihKIgc21hcnRwaG9uZQoKLS0tLSBGZWxpcGUgQmFsYmkgd3JvdGUg
LS0tLQoKPk9uIFRodSwgQXByIDI0LCAyMDE0IGF0IDA2OjQ4OjExUE0gKzAzMDAsIEl2YW4gVC4g
SXZhbm92IHdyb3RlOgo+PiBGcm9tOiBUaW0gQmlyZCA8dGJpcmQyMGRAZ21haWwuY29tPgo+PiAK
Pj4gRml4IHRoZSB2YWx1ZSB1c2VkIGZvciBQYXJhbGxlbCBUcmFuc2NlaXZlciBTZWxlY3QgKFBU
UykgZm9yIHRoZSBNU00gVVNCCj4+IGNvbnRyb2xsZXIuICBUaGlzIGlzIGEgc3RhbmRhcmQgY2hp
cGlkZWEgUE9SVFNDIGRlZmluaXRpb24sIHdoZXJlCj4+IGEgUEhZX1RZUEUgb2YgMTBiICg8PDMw
KSBpcyBVTFBJIGFuZCAxMWIgKDw8MzApIGlzIFNFUklBTC4KPj4gRml4IHRoZSBkZWZpbml0aW9u
cyBhbmQgdXNlIHRoZW0gY29ycmVjdGx5IGluIHRoZSBkcml2ZXIgY29kZS4KPj4gCj4+IFNpZ25l
ZC1vZmYtYnk6IFRpbSBCaXJkIDx0aW0uYmlyZEBzb255bW9iaWxlLmNvbT4KPgo+c2luY2UgeW91
J3JlIHRoZSBvbmUgc2VuZGluZyB0aGUgcGF0Y2gsIHlvdSBtdXN0IGFkZCB5b3VyIHNpZ25lZC1v
ZmYtYnkKPnRvby4gSWYgeW91IHJlcGx5IHdpdGggeW91ciBTb0IgSSdsbCBhZGQgdG8gcHJvcGVy
IHBhdGNoZXMuCj4KPi0tIAo+YmFsYmkK
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi April 30, 2014, 8:12 p.m. UTC | #3
Hi,

On Wed, Apr 30, 2014 at 08:07:05PM +0200, Bird, Tim wrote:
> Signed-off-by:Tim Bird <Tim.bird@sonymobile.com>

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 <tbird20d@gmail.com>
> >> 
> >> 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>
> >
> >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.
Ivan T. Ivanov May 2, 2014, 5:49 a.m. UTC | #4
On Wed, 2014-04-30 at 11:27 -0500, Felipe Balbi wrote:
> On Thu, Apr 24, 2014 at 06:48:11PM +0300, Ivan T. Ivanov wrote:
> > From: Tim Bird <tbird20d@gmail.com>
> > 
> > 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>
> 
> 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.
> 

Sure. 

Signed-of-by: Ivan T. Ivanov <iivanov@mm-sol.com>

Thanks.


--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi May 2, 2014, 2:23 p.m. UTC | #5
On Fri, May 02, 2014 at 08:49:05AM +0300, Ivan T. Ivanov wrote:
> On Wed, 2014-04-30 at 11:27 -0500, Felipe Balbi wrote:
> > On Thu, Apr 24, 2014 at 06:48:11PM +0300, Ivan T. Ivanov wrote:
> > > From: Tim Bird <tbird20d@gmail.com>
> > > 
> > > 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>
> > 
> > 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.
> > 
> 
> Sure. 
> 
> Signed-of-by: Ivan T. Ivanov <iivanov@mm-sol.com>

Thanks, I also need you to SoB the other patch from Tim.
diff mbox

Patch

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)