diff mbox

[v2,1/1] usb: chipidea: imx: Add system suspend/resume API

Message ID 1358735401-3779-1-git-send-email-peter.chen@freescale.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Chen Jan. 21, 2013, 2:30 a.m. UTC
During the system suspend/resume procedure, the USB also
needs to go suspend/resume procedure, this patch adds
related APIs. It is tested at i.mx6q sabrelite. Meanwhile,
it fixes the bug that the USB will out of work after
system suspend/resume.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
---
Changes for v2:
- Add tested-by from Shawn Guo
- Using dev_get_drvdata to get driver data

 drivers/usb/chipidea/bits.h        |    1 +
 drivers/usb/chipidea/ci13xxx_imx.c |   59 ++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)

Comments

Peter Chen Jan. 30, 2013, 7:32 a.m. UTC | #1
On Mon, Jan 21, 2013 at 10:30:01AM +0800, Peter Chen wrote:
> During the system suspend/resume procedure, the USB also
> needs to go suspend/resume procedure, this patch adds
> related APIs. It is tested at i.mx6q sabrelite. Meanwhile,
> it fixes the bug that the USB will out of work after
> system suspend/resume.
> 
> Signed-off-by: Peter Chen <peter.chen@freescale.com>
> Tested-by: Shawn Guo <shawn.guo@linaro.org>

ping....

Alex, can you help review it?
> ---
> Changes for v2:
> - Add tested-by from Shawn Guo
> - Using dev_get_drvdata to get driver data
> 
>  drivers/usb/chipidea/bits.h        |    1 +
>  drivers/usb/chipidea/ci13xxx_imx.c |   59 ++++++++++++++++++++++++++++++++++++
>  2 files changed, 60 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h
> index ba9c6ef..d1467bb 100644
> --- a/drivers/usb/chipidea/bits.h
> +++ b/drivers/usb/chipidea/bits.h
> @@ -47,6 +47,7 @@
>  #define PORTSC_FPR            BIT(6)
>  #define PORTSC_SUSP           BIT(7)
>  #define PORTSC_HSP            BIT(9)
> +#define PORTSC_PHCD           BIT(23) /* phy suspend mode */
>  #define PORTSC_PTC            (0x0FUL << 16)
>  
>  /* DEVLC */
> diff --git a/drivers/usb/chipidea/ci13xxx_imx.c b/drivers/usb/chipidea/ci13xxx_imx.c
> index 342eab0..ff11cee 100644
> --- a/drivers/usb/chipidea/ci13xxx_imx.c
> +++ b/drivers/usb/chipidea/ci13xxx_imx.c
> @@ -25,6 +25,7 @@
>  #include <linux/mfd/syscon.h>
>  
>  #include "ci.h"
> +#include "bits.h"
>  #include "ci13xxx_imx.h"
>  
>  #define pdev_to_phy(pdev) \
> @@ -321,6 +322,61 @@ static int ci13xxx_imx_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> +#ifdef CONFIG_PM
> +static int ci13xxx_imx_suspend(struct device *dev)
> +{
> +	struct ci13xxx_imx_data *data = dev_get_drvdata(dev);
> +	struct platform_device *plat_ci;
> +	struct ci13xxx	*ci;
> +
> +	plat_ci = data->ci_pdev;
> +	ci = platform_get_drvdata(plat_ci);
> +
> +	hw_write(ci, OP_PORTSC, PORTSC_PHCD, PORTSC_PHCD);
> +
> +	if (data->phy)
> +		usb_phy_set_suspend(data->phy, 1);
> +
> +	clk_disable_unprepare(data->clk);
> +
> +	return 0;
> +}
> +
> +static int ci13xxx_imx_resume(struct device *dev)
> +{
> +	int ret;
> +	struct ci13xxx_imx_data *data = dev_get_drvdata(dev);
> +	struct platform_device *plat_ci;
> +	struct ci13xxx	*ci;
> +
> +	plat_ci = data->ci_pdev;
> +	ci = platform_get_drvdata(plat_ci);
> +
> +	ret = clk_prepare_enable(data->clk);
> +	if (ret) {
> +		dev_err(dev,
> +			"Failed to prepare or enable clock, err=%d\n", ret);
> +		return ret;
> +	}
> +
> +	if (hw_read(ci, OP_PORTSC, PORTSC_PHCD)) {
> +		hw_write(ci, OP_PORTSC, PORTSC_PHCD, 0);
> +		/* Some clks sync between Controller and USB PHY */
> +		mdelay(1);
> +	}
> +
> +	if (data->phy)
> +		usb_phy_set_suspend(data->phy, 0);
> +
> +	return ret;
> +}
> +
> +static const struct dev_pm_ops ci13xxx_imx_pm_ops = {
> +	.suspend	= ci13xxx_imx_suspend,
> +	.resume		= ci13xxx_imx_resume,
> +};
> +#endif
> +
>  static const struct of_device_id ci13xxx_imx_dt_ids[] = {
>  	{ .compatible = "fsl,imx27-usb", },
>  	{ /* sentinel */ }
> @@ -334,6 +390,9 @@ static struct platform_driver ci13xxx_imx_driver = {
>  		.name = "imx_usb",
>  		.owner = THIS_MODULE,
>  		.of_match_table = ci13xxx_imx_dt_ids,
> +#ifdef CONFIG_PM
> +		.pm	= &ci13xxx_imx_pm_ops,
> +#endif
>  	 },
>  };
>  
> -- 
> 1.7.0.4
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
diff mbox

Patch

diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h
index ba9c6ef..d1467bb 100644
--- a/drivers/usb/chipidea/bits.h
+++ b/drivers/usb/chipidea/bits.h
@@ -47,6 +47,7 @@ 
 #define PORTSC_FPR            BIT(6)
 #define PORTSC_SUSP           BIT(7)
 #define PORTSC_HSP            BIT(9)
+#define PORTSC_PHCD           BIT(23) /* phy suspend mode */
 #define PORTSC_PTC            (0x0FUL << 16)
 
 /* DEVLC */
diff --git a/drivers/usb/chipidea/ci13xxx_imx.c b/drivers/usb/chipidea/ci13xxx_imx.c
index 342eab0..ff11cee 100644
--- a/drivers/usb/chipidea/ci13xxx_imx.c
+++ b/drivers/usb/chipidea/ci13xxx_imx.c
@@ -25,6 +25,7 @@ 
 #include <linux/mfd/syscon.h>
 
 #include "ci.h"
+#include "bits.h"
 #include "ci13xxx_imx.h"
 
 #define pdev_to_phy(pdev) \
@@ -321,6 +322,61 @@  static int ci13xxx_imx_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_PM
+static int ci13xxx_imx_suspend(struct device *dev)
+{
+	struct ci13xxx_imx_data *data = dev_get_drvdata(dev);
+	struct platform_device *plat_ci;
+	struct ci13xxx	*ci;
+
+	plat_ci = data->ci_pdev;
+	ci = platform_get_drvdata(plat_ci);
+
+	hw_write(ci, OP_PORTSC, PORTSC_PHCD, PORTSC_PHCD);
+
+	if (data->phy)
+		usb_phy_set_suspend(data->phy, 1);
+
+	clk_disable_unprepare(data->clk);
+
+	return 0;
+}
+
+static int ci13xxx_imx_resume(struct device *dev)
+{
+	int ret;
+	struct ci13xxx_imx_data *data = dev_get_drvdata(dev);
+	struct platform_device *plat_ci;
+	struct ci13xxx	*ci;
+
+	plat_ci = data->ci_pdev;
+	ci = platform_get_drvdata(plat_ci);
+
+	ret = clk_prepare_enable(data->clk);
+	if (ret) {
+		dev_err(dev,
+			"Failed to prepare or enable clock, err=%d\n", ret);
+		return ret;
+	}
+
+	if (hw_read(ci, OP_PORTSC, PORTSC_PHCD)) {
+		hw_write(ci, OP_PORTSC, PORTSC_PHCD, 0);
+		/* Some clks sync between Controller and USB PHY */
+		mdelay(1);
+	}
+
+	if (data->phy)
+		usb_phy_set_suspend(data->phy, 0);
+
+	return ret;
+}
+
+static const struct dev_pm_ops ci13xxx_imx_pm_ops = {
+	.suspend	= ci13xxx_imx_suspend,
+	.resume		= ci13xxx_imx_resume,
+};
+#endif
+
 static const struct of_device_id ci13xxx_imx_dt_ids[] = {
 	{ .compatible = "fsl,imx27-usb", },
 	{ /* sentinel */ }
@@ -334,6 +390,9 @@  static struct platform_driver ci13xxx_imx_driver = {
 		.name = "imx_usb",
 		.owner = THIS_MODULE,
 		.of_match_table = ci13xxx_imx_dt_ids,
+#ifdef CONFIG_PM
+		.pm	= &ci13xxx_imx_pm_ops,
+#endif
 	 },
 };