devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Chen <peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: balbi-l0cyMroinI0@public.gmane.org,
	shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
	rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org,
	grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
Cc: alexander.shishkin-VuQAYsv1563Yd54FQh9/CA@public.gmane.org,
	linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
	marex-ynQEQJNshbs@public.gmane.org,
	kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
	m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
	frank.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org,
	peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org,
	gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v6 08/15] usb: phy-mxs: Add implementation of nofity_suspend and notify_resume
Date: Fri, 13 Dec 2013 09:23:38 +0800	[thread overview]
Message-ID: <1386897825-6130-9-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1386897825-6130-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>

Implementation of notify_suspend and notify_resume will be different
according to mxs_phy_data->flags.

Signed-off-by: Peter Chen <peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
 drivers/usb/phy/phy-mxs-usb.c |   55 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 0ef930a..e3df53f 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -166,8 +166,8 @@ static int mxs_phy_suspend(struct usb_phy *x, int suspend)
 static int mxs_phy_on_connect(struct usb_phy *phy,
 		enum usb_device_speed speed)
 {
-	dev_dbg(phy->dev, "%s speed device has connected\n",
-		(speed == USB_SPEED_HIGH) ? "high" : "non-high");
+	dev_dbg(phy->dev, "%s device has connected\n",
+		(speed == USB_SPEED_HIGH) ? "HS" : "FS/LS");
 
 	if (speed == USB_SPEED_HIGH)
 		writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
@@ -179,8 +179,8 @@ static int mxs_phy_on_connect(struct usb_phy *phy,
 static int mxs_phy_on_disconnect(struct usb_phy *phy,
 		enum usb_device_speed speed)
 {
-	dev_dbg(phy->dev, "%s speed device has disconnected\n",
-		(speed == USB_SPEED_HIGH) ? "high" : "non-high");
+	dev_dbg(phy->dev, "%s device has disconnected\n",
+		(speed == USB_SPEED_HIGH) ? "HS" : "FS/LS");
 
 	if (speed == USB_SPEED_HIGH)
 		writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
@@ -189,6 +189,48 @@ static int mxs_phy_on_disconnect(struct usb_phy *phy,
 	return 0;
 }
 
+static int mxs_phy_on_suspend(struct usb_phy *phy,
+		enum usb_device_speed speed)
+{
+	struct mxs_phy *mxs_phy = to_mxs_phy(phy);
+
+	dev_dbg(phy->dev, "%s device has suspended\n",
+		(speed == USB_SPEED_HIGH) ? "HS" : "FS/LS");
+
+	/* delay 4ms to wait bus entering idle */
+	usleep_range(4000, 5000);
+
+	if (mxs_phy->data->flags & MXS_PHY_ABNORMAL_IN_SUSPEND) {
+		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;
+}
+
+/*
+ * 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 device has resumed\n",
+		(speed == USB_SPEED_HIGH) ? "HS" : "FS/LS");
+
+	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;
+}
+
 static int mxs_phy_probe(struct platform_device *pdev)
 {
 	struct resource *res;
@@ -235,6 +277,11 @@ static int mxs_phy_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, mxs_phy);
 
+	if (mxs_phy->data->flags & MXS_PHY_SENDING_SOF_TOO_FAST) {
+		mxs_phy->phy.notify_suspend = mxs_phy_on_suspend;
+		mxs_phy->phy.notify_resume = mxs_phy_on_resume;
+	}
+
 	if (mxs_phy->data->flags & MXS_PHY_HAS_ANATOP) {
 		mxs_phy->regmap_anatop = syscon_regmap_lookup_by_phandle
 			(np, "fsl,anatop");
-- 
1.7.8


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

  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 ` [PATCH v6 02/15] usb: phy-mxs: Add platform judgement code Peter Chen
2013-12-13  4:19   ` 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   ` Peter Chen [this message]
2013-12-13  4:32     ` [PATCH v6 08/15] usb: phy-mxs: Add implementation of nofity_suspend and notify_resume 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-9-git-send-email-peter.chen@freescale.com \
    --to=peter.chen-kzfg59tc24xl57midrcfdg@public.gmane.org \
    --cc=alexander.shishkin-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
    --cc=balbi-l0cyMroinI0@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=frank.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
    --cc=grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
    --cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
    --cc=marex-ynQEQJNshbs@public.gmane.org \
    --cc=rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org \
    --cc=shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.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).