[PATCH v3 08/11] usb: phy-mxs: Enable IC fixes for related SoCs
From: Peter Chen <hidden>
Date: 2013-11-05 01:49:40
Also in:
linux-devicetree
Subsystem:
the rest, usb subsystem · Maintainers:
Linus Torvalds, Greg Kroah-Hartman
Possibly related (same subject, not in this thread)
- 2013-11-06 · Re: [PATCH v3 08/11] usb: phy-mxs: Enable IC fixes for related SoCs · Peter Chen <hidden>
- 2013-11-05 · Re: [PATCH v3 08/11] usb: phy-mxs: Enable IC fixes for related SoCs · Michał Mirosław <hidden>
Some PHY bugs are fixed by IC logic, but these bits are not enabled by default, so we enable them at driver. Signed-off-by: Peter Chen <redacted> --- drivers/usb/phy/phy-mxs-usb.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index c794011..b7e1744 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c@@ -31,6 +31,10 @@ #define HW_USBPHY_CTRL_SET 0x34 #define HW_USBPHY_CTRL_CLR 0x38 +#define HW_USBPHY_IP 0x90 +#define HW_USBPHY_IP_SET 0x94 +#define HW_USBPHY_IP_CLR 0x98 + #define BM_USBPHY_CTRL_SFTRST BIT(31) #define BM_USBPHY_CTRL_CLKGATE BIT(30) #define BM_USBPHY_CTRL_ENAUTOSET_USBCLKS BIT(26)
@@ -60,6 +64,18 @@ */ #define MXS_PHY_SENDING_SOF_TOO_FAST BIT(2) +/* + * IC fix for MXS_PHY_ABNORAML_IN_SUSPEND, bit 17 is the effective bit + * in HW_USBPHY_IP. + */ +#define MXS_PHY_FIX_ABNORAML_IN_SUSPEND BIT(17) + +/* + * IC fix for MXS_PHY_SENDING_SOF_TOO_FAST, bit 18 is the effective bit + * in HW_USBPHY_IP. + */ +#define MXS_PHY_FIX_SENDING_SOF_TOO_FAST BIT(18) + struct mxs_phy_platform_flag { unsigned int flags; };
@@ -70,11 +86,14 @@ static const struct mxs_phy_platform_flag imx23_phy_data = { static const struct mxs_phy_platform_flag imx6q_phy_data = { .flags = MXS_PHY_SENDING_SOF_TOO_FAST | - MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS, + MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS | + MXS_PHY_FIX_ABNORAML_IN_SUSPEND, }; static const struct mxs_phy_platform_flag imx6sl_phy_data = { - .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS, + .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS | + MXS_PHY_FIX_ABNORAML_IN_SUSPEND | + MXS_PHY_FIX_SENDING_SOF_TOO_FAST, }; static const struct of_device_id mxs_phy_dt_ids[] = {
@@ -118,6 +137,15 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy) BM_USBPHY_CTRL_ENUTMILEVEL3, base + HW_USBPHY_CTRL_SET); + /* Enable IC solution */ + if (mxs_phy->flags & MXS_PHY_FIX_ABNORAML_IN_SUSPEND) + writel(MXS_PHY_FIX_ABNORAML_IN_SUSPEND, + base + HW_USBPHY_IP_SET); + + if (mxs_phy->flags & MXS_PHY_FIX_SENDING_SOF_TOO_FAST) + writel(MXS_PHY_FIX_SENDING_SOF_TOO_FAST, + base + HW_USBPHY_IP_SET); + return 0; }
--
1.7.1