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 v3 07/11] usb: phy-mxs: Add implementation of nofity_suspend and notify_resume
Date: Tue, 5 Nov 2013 09:49:39 +0800	[thread overview]
Message-ID: <1383616183-10511-8-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1383616183-10511-1-git-send-email-peter.chen@freescale.com>

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

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

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 8cdfbf1..c794011 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -161,8 +161,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,
@@ -174,8 +174,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,
@@ -184,6 +184,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->flags & MXS_PHY_ABNORAML_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;
@@ -239,6 +281,10 @@ static int mxs_phy_probe(struct platform_device *pdev)
 
 	mxs_phy->clk = clk;
 	mxs_phy->flags = platform_flag->flags;
+	if (mxs_phy->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;
+	}
 
 	platform_set_drvdata(pdev, &mxs_phy->phy);
 
-- 
1.7.1



  parent reply	other threads:[~2013-11-05  1:49 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-05  1:49 [PATCH v3 00/11] Add power management support for MXS PHY Peter Chen
2013-11-05  1:49 ` [PATCH v3 02/11] usb: phy-mxs: Add auto clock and power setting Peter Chen
2013-11-05  1:49 ` [PATCH v3 03/11] usb: doc: phy-mxs: update binding for adding anatop phandle Peter Chen
2013-11-05  2:34   ` Shawn Guo
2013-11-05  2:50     ` Peter Chen
2013-11-05  3:15       ` Shawn Guo
2013-11-05  1:49 ` [PATCH v3 05/11] usb: phy-mxs: Add anatop regmap Peter Chen
2013-11-05  2:47   ` Shawn Guo
     [not found]     ` <20131105024753.GH19770-rvtDTF3kK1ictlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2013-11-05  5:17       ` Peter Chen
2013-11-05  1:49 ` [PATCH v3 06/11] usb: phy: add notify suspend and resume callback Peter Chen
2013-11-05  1:49 ` Peter Chen [this message]
     [not found] ` <1383616183-10511-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-11-05  1:49   ` [PATCH v3 01/11] usb: phy-mxs: Add platform judgement code Peter Chen
2013-11-05  2:29     ` Shawn Guo
2013-11-05  2:48       ` Peter Chen
2013-11-05  1:49   ` [PATCH v3 04/11] ARM: dts: imx6: add anatop phandle for usbphy Peter Chen
2013-11-05  2:41     ` Shawn Guo
2013-11-05  2:53       ` Peter Chen
2013-11-05  3:16         ` Shawn Guo
     [not found]           ` <20131105031654.GL19770-rvtDTF3kK1ictlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2013-11-05  3:02             ` Peter Chen
2013-11-05  1:49   ` [PATCH v3 08/11] usb: phy-mxs: Enable IC fixes for related SoCs Peter Chen
     [not found]     ` <1383616183-10511-9-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-11-05 21:02       ` Michał Mirosław
2013-11-06  7:35         ` Peter Chen
2013-11-05  1:49   ` [PATCH v3 09/11] usb: phy: Add set_wakeup API Peter Chen
2013-11-05  1:49 ` [PATCH v3 10/11] usb: phy-mxs: Add implementation of set_wakeup Peter Chen
2013-11-05  1:49 ` [PATCH v3 11/11] usb: phy-mxs: Add system suspend/resume API Peter Chen
     [not found]   ` <1383616183-10511-12-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-11-05  3:05     ` Shawn Guo
2013-11-05  2:59       ` Peter Chen
2013-11-05  4:04         ` Shawn Guo

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=1383616183-10511-8-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).