devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Chen <peter.chen@freescale.com>
To: balbi@ti.com, shawn.guo@linaro.org, rob.herring@calxeda.com,
	grant.likely@linaro.org
Cc: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	festevam@gmail.com, marex@denx.de, kernel@pengutronix.de,
	m.grzeschik@pengutronix.de, frank.li@freescale.com,
	peter.chen@freescale.com, gregkh@linuxfoundation.org,
	devicetree@vger.kernel.org, linux-doc@vger.kernel.org
Subject: [PATCH v7 08/14] usb: phy-mxs: Enable IC fixes for related SoCs
Date: Fri, 20 Dec 2013 15:52:04 +0800	[thread overview]
Message-ID: <1387525930-27313-9-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1387525930-27313-1-git-send-email-peter.chen@freescale.com>

Two PHY bugs are fixed by IC logic, but these bits are not
enabled by default, so we enable them at driver.
The two bugs are: MXS_PHY_ABNORMAL_IN_SUSPEND and MXS_PHY_SENDING_SOF_TOO_FAST
which are described at code.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
 drivers/usb/phy/phy-mxs-usb.c |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 489096f..f28bdd8 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)
@@ -42,6 +46,8 @@
 #define BM_USBPHY_CTRL_ENUTMILEVEL2		BIT(14)
 #define BM_USBPHY_CTRL_ENHOSTDISCONDETECT	BIT(1)
 
+#define BM_USBPHY_IP_FIX                       (BIT(17) | BIT(18))
+
 #define to_mxs_phy(p) container_of((p), struct mxs_phy, phy)
 
 /* Do disconnection between PHY and controller without vbus */
@@ -63,6 +69,14 @@
 /* The SoCs who have anatop module */
 #define MXS_PHY_HAS_ANATOP			BIT(3)
 
+/*
+ * IC has bug fixes logic, they include
+ * MXS_PHY_ABNORMAL_IN_SUSPEND and MXS_PHY_SENDING_SOF_TOO_FAST
+ * which are described at above flags, the RTL will handle it
+ * according to different versions.
+ */
+#define MXS_PHY_NEED_IP_FIX			BIT(4)
+
 struct mxs_phy_data {
 	unsigned int flags;
 };
@@ -74,12 +88,14 @@ static const struct mxs_phy_data imx23_phy_data = {
 static const struct mxs_phy_data imx6q_phy_data = {
 	.flags = MXS_PHY_SENDING_SOF_TOO_FAST |
 		MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
-		MXS_PHY_HAS_ANATOP,
+		MXS_PHY_HAS_ANATOP |
+		MXS_PHY_NEED_IP_FIX,
 };
 
 static const struct mxs_phy_data imx6sl_phy_data = {
 	.flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
-		MXS_PHY_HAS_ANATOP,
+		MXS_PHY_HAS_ANATOP |
+		MXS_PHY_NEED_IP_FIX,
 };
 
 static const struct of_device_id mxs_phy_dt_ids[] = {
@@ -123,6 +139,9 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
 		BM_USBPHY_CTRL_ENUTMILEVEL3,
 	       base + HW_USBPHY_CTRL_SET);
 
+	if (mxs_phy->data->flags & MXS_PHY_NEED_IP_FIX)
+		writel(BM_USBPHY_IP_FIX, base + HW_USBPHY_IP_SET);
+
 	return 0;
 }
 
-- 
1.7.8



  parent reply	other threads:[~2013-12-20  7:52 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-20  7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
2013-12-20  7:51 ` [PATCH v7 01/14] usb: doc: phy-mxs: Add more compatible strings Peter Chen
2013-12-20  7:51 ` [PATCH v7 02/14] usb: phy-mxs: Add platform judgement code Peter Chen
2013-12-20  7:51 ` [PATCH v7 03/14] usb: phy-mxs: Add auto clock and power setting Peter Chen
2013-12-20  7:52 ` [PATCH v7 04/14] usb: doc: phy-mxs: update binding for adding anatop phandle Peter Chen
2013-12-20  7:52 ` [PATCH v7 05/14] ARM: dts: imx6: add anatop phandle for usbphy Peter Chen
     [not found] ` <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-12-20  7:52   ` [PATCH v7 06/14] usb: phy-mxs: Add anatop regmap Peter Chen
2013-12-24  0:15     ` Shawn Guo
2013-12-24  1:20       ` Peter Chen
     [not found]         ` <20131224012010.GA13518-KgLukfWpBlCctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2013-12-24  2:05           ` Shawn Guo
2013-12-20  7:52   ` [PATCH v7 07/14] usb: phy-mxs: change description of usb device speed Peter Chen
2013-12-20 10:40     ` David Laight
     [not found]       ` <AE90C24D6B3A694183C094C60CF0A2F6026B74C0-CgBM+Bx2aUAnGFn1LkZF6NBPR1lH4CV8@public.gmane.org>
2013-12-23  1:05         ` Peter Chen
2013-12-20  7:52   ` [PATCH v7 10/14] usb: phy-mxs: add controller id Peter Chen
2013-12-24  2:08     ` Shawn Guo
2013-12-24  1:34       ` Peter Chen
2013-12-24  2:25         ` Shawn Guo
2013-12-24  2:09           ` Peter Chen
     [not found]             ` <20131224020916.GC13518-KgLukfWpBlCctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2013-12-24  2:54               ` Shawn Guo
2013-12-20  7:52   ` [PATCH v7 12/14] usb: phy-mxs: Add implementation of set_wakeup Peter Chen
2013-12-20  7:52   ` [PATCH v7 14/14] usb: phy-mxs: Add sync time after controller clear phcd Peter Chen
2013-12-20  7:52 ` Peter Chen [this message]
2013-12-20  7:52 ` [PATCH v7 09/14] ARM: dts: imx: add mxs phy controller id Peter Chen
2013-12-20  7:52 ` [PATCH v7 11/14] usb: phy: Add set_wakeup API Peter Chen
2013-12-20  7:52 ` [PATCH v7 13/14] usb: phy-mxs: Add system suspend/resume API Peter Chen
2013-12-23 16:58 ` [PATCH v7 00/14] Add power management support for mxs phy Felipe Balbi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1387525930-27313-9-git-send-email-peter.chen@freescale.com \
    --to=peter.chen@freescale.com \
    --cc=balbi@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=frank.li@freescale.com \
    --cc=grant.likely@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=m.grzeschik@pengutronix.de \
    --cc=marex@denx.de \
    --cc=rob.herring@calxeda.com \
    --cc=shawn.guo@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).