| Message ID | 1381568986-19802-6-git-send-email-peter.chen@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Oct 12, 2013 at 11:42:06AM +0200, Marek Vasut wrote: > Dear Peter Chen, > > > Add notify_suspend and notify_resume according to different SoCs. > > > > Signed-off-by: Peter Chen <peter.chen@freescale.com> > > --- > > drivers/usb/phy/phy-mxs-usb.c | 73 > > +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 > > insertions(+), 0 deletions(-) > > > > diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c > > index e0b0de0..8661dae 100644 > > --- a/drivers/usb/phy/phy-mxs-usb.c > > +++ b/drivers/usb/phy/phy-mxs-usb.c > > @@ -197,6 +197,78 @@ static int mxs_phy_on_disconnect(struct usb_phy *phy, > > return 0; > > } > > > > +static int mxs_phy_on_suspend_workaround(struct usb_phy *phy, > > + enum usb_device_speed speed) > > +{ > > + dev_dbg(phy->dev, "%s speed device has suspended\n", > > + (speed == USB_SPEED_HIGH) ? "high" : "non-high"); > > HS : FS/LS you mean? Yes, it is what I mean. OK, I will change to HS and FS/LS. > > > +/* > > + * For mxs PHY, there are two PHY issues related to suspend/resume. > > + * For mx23 and mx28, both of two issues are existed. > > + * For mx6q and mx6dl, only one issue is existed. > > + * For mx6 sololite, none issue is existed. > > + */ > > +static void mxs_phy_workaround(struct mxs_phy *mxs_phy) > > +{ > > + if (is_mx23_phy(mxs_phy)) { > > This is_mx23_phy() returns 1 for mx28 too? It's not too clear, not even from the > comment above, a short comment here would help for sure. mx23 and mx28 PHY are the same PHY, so the fixes are the same. Anything I need to add?
Dear Peter Chen, > On Sat, Oct 12, 2013 at 11:42:06AM +0200, Marek Vasut wrote: > > Dear Peter Chen, > > > > > Add notify_suspend and notify_resume according to different SoCs. > > > > > > Signed-off-by: Peter Chen <peter.chen@freescale.com> > > > --- > > > > > > drivers/usb/phy/phy-mxs-usb.c | 73 > > > > > > +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 > > > insertions(+), 0 deletions(-) > > > > > > diff --git a/drivers/usb/phy/phy-mxs-usb.c > > > b/drivers/usb/phy/phy-mxs-usb.c index e0b0de0..8661dae 100644 > > > --- a/drivers/usb/phy/phy-mxs-usb.c > > > +++ b/drivers/usb/phy/phy-mxs-usb.c > > > @@ -197,6 +197,78 @@ static int mxs_phy_on_disconnect(struct usb_phy > > > *phy, > > > > > > return 0; > > > > > > } > > > > > > +static int mxs_phy_on_suspend_workaround(struct usb_phy *phy, > > > + enum usb_device_speed speed) > > > +{ > > > + dev_dbg(phy->dev, "%s speed device has suspended\n", > > > + (speed == USB_SPEED_HIGH) ? "high" : "non-high"); > > > > HS : FS/LS you mean? > > Yes, it is what I mean. > OK, I will change to HS and FS/LS. > > > > +/* > > > + * For mxs PHY, there are two PHY issues related to suspend/resume. > > > + * For mx23 and mx28, both of two issues are existed. > > > + * For mx6q and mx6dl, only one issue is existed. > > > + * For mx6 sololite, none issue is existed. > > > + */ > > > +static void mxs_phy_workaround(struct mxs_phy *mxs_phy) > > > +{ > > > + if (is_mx23_phy(mxs_phy)) { > > > > This is_mx23_phy() returns 1 for mx28 too? It's not too clear, not even > > from the comment above, a short comment here would help for sure. > > mx23 and mx28 PHY are the same PHY, so the fixes are the same. > Anything I need to add? I believe it's OK. But identifying MX28 PHY via is_mx23_phy() might be a little confusing. I'm just trying to keep this driver flushed out of my brain here and do an unbiased review ;-) Best regards, Marek Vasut
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c index e0b0de0..8661dae 100644 --- a/drivers/usb/phy/phy-mxs-usb.c +++ b/drivers/usb/phy/phy-mxs-usb.c @@ -197,6 +197,78 @@ static int mxs_phy_on_disconnect(struct usb_phy *phy, return 0; } +static int mxs_phy_on_suspend_workaround(struct usb_phy *phy, + enum usb_device_speed speed) +{ + dev_dbg(phy->dev, "%s speed device has suspended\n", + (speed == USB_SPEED_HIGH) ? "high" : "non-high"); + + /* delay 4ms to wait bus entering idle */ + usleep_range(4000, 5000); + + /* + * Workaround for wakeup signal between portsc.suspendM + * and PHY enters low power mode. + */ + writel_relaxed(0xffffffff, phy->io_priv + HW_USBPHY_PWD); + writel_relaxed(0, phy->io_priv + HW_USBPHY_PWD); + + if (speed == USB_SPEED_HIGH) + writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT, + phy->io_priv + HW_USBPHY_CTRL_CLR); + + return 0; +} + +static int mxs_phy_on_suspend(struct usb_phy *phy, + enum usb_device_speed speed) +{ + dev_dbg(phy->dev, "%s speed device has suspended\n", + (speed == USB_SPEED_HIGH) ? "high" : "non-high"); + + if (speed == USB_SPEED_HIGH) + writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT, + phy->io_priv + HW_USBPHY_CTRL_CLR); + + return 0; +} + +/* + * The resume signal must be finished here. + */ +static int mxs_phy_on_resume(struct usb_phy *phy, + enum usb_device_speed speed) +{ + dev_dbg(phy->dev, "%s speed device has resumed\n", + (speed == USB_SPEED_HIGH) ? "high" : "non-high"); + + if (speed == USB_SPEED_HIGH) { + /* Make sure the device has switched to High-Speed mode */ + udelay(500); + writel_relaxed(BM_USBPHY_CTRL_ENHOSTDISCONDETECT, + phy->io_priv + HW_USBPHY_CTRL_SET); + } + + return 0; +} + +/* + * For mxs PHY, there are two PHY issues related to suspend/resume. + * For mx23 and mx28, both of two issues are existed. + * For mx6q and mx6dl, only one issue is existed. + * For mx6 sololite, none issue is existed. + */ +static void mxs_phy_workaround(struct mxs_phy *mxs_phy) +{ + if (is_mx23_phy(mxs_phy)) { + mxs_phy->phy.notify_suspend = mxs_phy_on_suspend_workaround; + mxs_phy->phy.notify_resume = mxs_phy_on_resume; + } else if (is_mx6q_phy(mxs_phy)) { + mxs_phy->phy.notify_suspend = mxs_phy_on_suspend; + mxs_phy->phy.notify_resume = mxs_phy_on_resume; + } +} + static int mxs_phy_probe(struct platform_device *pdev) { struct resource *res; @@ -257,6 +329,7 @@ static int mxs_phy_probe(struct platform_device *pdev) mxs_phy->clk = clk; mxs_phy->devtype = pdev->id_entry->driver_data; + mxs_phy_workaround(mxs_phy); platform_set_drvdata(pdev, &mxs_phy->phy);
Add notify_suspend and notify_resume according to different SoCs. Signed-off-by: Peter Chen <peter.chen@freescale.com> --- drivers/usb/phy/phy-mxs-usb.c | 73 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-)