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: alexander.shishkin@linux.intel.com, 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 v6 02/15] usb: phy-mxs: Add platform judgement code
Date: Fri, 13 Dec 2013 09:23:32 +0800	[thread overview]
Message-ID: <1386897825-6130-3-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1386897825-6130-1-git-send-email-peter.chen@freescale.com>

The mxs-phy has several bugs and features at different
versions, the driver code can get it through of_device_id.data.

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

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 545844b..6d49040 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
  * Copyright (C) 2012 Marek Vasut <marex@denx.de>
  * on behalf of DENX Software Engineering GmbH
  *
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/of_device.h>
 
 #define DRIVER_NAME "mxs_phy"
 
@@ -34,13 +35,55 @@
 #define BM_USBPHY_CTRL_ENUTMILEVEL2		BIT(14)
 #define BM_USBPHY_CTRL_ENHOSTDISCONDETECT	BIT(1)
 
+#define to_mxs_phy(p) container_of((p), struct mxs_phy, phy)
+
+/* Do disconnection between PHY and controller without vbus */
+#define MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS	BIT(0)
+
+/*
+ * The PHY will be in messy if there is a wakeup after putting
+ * bus to suspend (set portsc.suspendM) but before setting PHY to low
+ * power mode (set portsc.phcd).
+ */
+#define MXS_PHY_ABNORMAL_IN_SUSPEND		BIT(1)
+
+/*
+ * The SOF sends too fast after resuming, it will cause disconnection
+ * between host and high speed device.
+ */
+#define MXS_PHY_SENDING_SOF_TOO_FAST		BIT(2)
+
+struct mxs_phy_data {
+	unsigned int flags;
+};
+
+static const struct mxs_phy_data imx23_phy_data = {
+	.flags = MXS_PHY_ABNORMAL_IN_SUSPEND | MXS_PHY_SENDING_SOF_TOO_FAST,
+};
+
+static const struct mxs_phy_data imx6q_phy_data = {
+	.flags = MXS_PHY_SENDING_SOF_TOO_FAST |
+		MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS,
+};
+
+static const struct mxs_phy_data imx6sl_phy_data = {
+	.flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS,
+};
+
+static const struct of_device_id mxs_phy_dt_ids[] = {
+	{ .compatible = "fsl,imx6sl-usbphy", .data = &imx6sl_phy_data, },
+	{ .compatible = "fsl,imx6q-usbphy", .data = &imx6q_phy_data, },
+	{ .compatible = "fsl,imx23-usbphy", .data = &imx23_phy_data, },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mxs_phy_dt_ids);
+
 struct mxs_phy {
 	struct usb_phy phy;
 	struct clk *clk;
+	const struct mxs_phy_data *data;
 };
 
-#define to_mxs_phy(p) container_of((p), struct mxs_phy, phy)
-
 static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)
 {
 	int ret;
@@ -131,6 +174,8 @@ static int mxs_phy_probe(struct platform_device *pdev)
 	struct clk *clk;
 	struct mxs_phy *mxs_phy;
 	int ret;
+	const struct of_device_id *of_id =
+			of_match_device(mxs_phy_dt_ids, &pdev->dev);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	base = devm_ioremap_resource(&pdev->dev, res);
@@ -163,6 +208,7 @@ static int mxs_phy_probe(struct platform_device *pdev)
 	ATOMIC_INIT_NOTIFIER_HEAD(&mxs_phy->phy.notifier);
 
 	mxs_phy->clk = clk;
+	mxs_phy->data = of_id->data;
 
 	platform_set_drvdata(pdev, mxs_phy);
 
@@ -182,12 +228,6 @@ static int mxs_phy_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id mxs_phy_dt_ids[] = {
-	{ .compatible = "fsl,imx23-usbphy", },
-	{ /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, mxs_phy_dt_ids);
-
 static struct platform_driver mxs_phy_driver = {
 	.probe = mxs_phy_probe,
 	.remove = mxs_phy_remove,
-- 
1.7.8



  parent reply	other threads:[~2013-12-13  1:23 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-13  1:23 [PATCH v6 00/15] Add power management support for mxs phy Peter Chen
2013-12-13  1:23 ` [PATCH v6 01/15] usb: doc: phy-mxs: Add more compatible strings Peter Chen
2013-12-13  7:15   ` Lothar Waßmann
2013-12-13  7:24     ` Peter Chen
2013-12-13  7:38       ` Lothar Waßmann
2013-12-13  7:58         ` Peter Chen
2013-12-13  1:23 ` Peter Chen [this message]
2013-12-13  4:19   ` [PATCH v6 02/15] usb: phy-mxs: Add platform judgement code Felipe Balbi
     [not found]     ` <20131213041918.GC867-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-12-13  5:15       ` Peter Chen
2013-12-13  1:23 ` [PATCH v6 03/15] usb: phy-mxs: Add auto clock and power setting Peter Chen
2013-12-13  4:23   ` Felipe Balbi
2013-12-13  5:55     ` Peter Chen
2013-12-13  1:23 ` [PATCH v6 04/15] usb: doc: phy-mxs: update binding for adding anatop phandle Peter Chen
2013-12-13  4:25   ` Felipe Balbi
     [not found]     ` <20131213042504.GE867-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-12-13  6:00       ` Peter Chen
2013-12-13  1:23 ` [PATCH v6 05/15] ARM: dts: imx6: add anatop phandle for usbphy Peter Chen
     [not found] ` <1386897825-6130-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-12-13  1:23   ` [PATCH v6 06/15] usb: phy-mxs: Add anatop regmap Peter Chen
2013-12-13  4:26     ` Felipe Balbi
     [not found]       ` <20131213042627.GF867-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-12-13  6:04         ` Peter Chen
2013-12-13  1:23   ` [PATCH v6 07/15] usb: phy: add notify suspend and resume callback Peter Chen
     [not found]     ` <1386897825-6130-8-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-12-13  4:27       ` Felipe Balbi
     [not found]         ` <20131213042722.GG867-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-12-13  6:23           ` Peter Chen
2013-12-13  1:23   ` [PATCH v6 08/15] usb: phy-mxs: Add implementation of nofity_suspend and notify_resume Peter Chen
2013-12-13  4:32     ` Felipe Balbi
2013-12-13  6:31       ` Peter Chen
2013-12-13 20:09         ` Felipe Balbi
2013-12-16  1:12           ` Peter Chen
2013-12-16 21:31             ` Felipe Balbi
2013-12-13  1:23   ` [PATCH v6 11/15] usb: phy-mxs: add controller id Peter Chen
2013-12-13  1:23   ` [PATCH v6 13/15] usb: phy-mxs: Add implementation of set_wakeup Peter Chen
2013-12-13  1:23   ` [PATCH v6 14/15] usb: phy-mxs: Add system suspend/resume API Peter Chen
2013-12-13  4:38     ` Felipe Balbi
     [not found]       ` <20131213043838.GI867-HgARHv6XitL9zxVx7UNMDg@public.gmane.org>
2013-12-13  6:34         ` Peter Chen
2013-12-13  1:23   ` [PATCH v6 15/15] usb: phy-mxs: Add sync time after controller clear phcd Peter Chen
     [not found]     ` <1386897825-6130-16-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-12-13  4:39       ` Felipe Balbi
2013-12-13  6:50         ` Peter Chen
2013-12-13  1:23 ` [PATCH v6 09/15] usb: phy-mxs: Enable IC fixes for related SoCs Peter Chen
2013-12-13  1:23 ` [PATCH v6 10/15] ARM: dts: imx: add mxs phy controller id Peter Chen
2013-12-13  1:23 ` [PATCH v6 12/15] usb: phy: Add set_wakeup API Peter Chen

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=1386897825-6130-3-git-send-email-peter.chen@freescale.com \
    --to=peter.chen@freescale.com \
    --cc=alexander.shishkin@linux.intel.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).