From: Ravi Babu <ravibabu@ti.com>
To: <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <balbi@ti.com>, Ravi Babu <ravibabu@ti.com>
Subject: [PATCH v2 4/7] usb: musb: dsps: use usb-phy driver API for phy power on/off
Date: Tue, 11 Jun 2013 12:47:49 +0530 [thread overview]
Message-ID: <1370935072-21056-5-git-send-email-ravibabu@ti.com> (raw)
In-Reply-To: <1370935072-21056-1-git-send-email-ravibabu@ti.com>
use usb-phy driver API for powering on/off phy and removed
usage of the phy control access in platform glue driver.
Signed-off-by: Ravi Babu <ravibabu@ti.com>
---
drivers/usb/musb/musb_dsps.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 0ecedb3..0096aad 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -36,6 +36,7 @@
#include <linux/dma-mapping.h>
#include <linux/pm_runtime.h>
#include <linux/module.h>
+#include <linux/usb/phy.h>
#include <linux/platform_data/usb-omap.h>
#include <linux/sizes.h>
@@ -432,7 +433,7 @@ static int dsps_musb_init(struct musb *musb)
dsps_writel(reg_base, wrp->control, (1 << wrp->reset));
/* Start the on-chip PHY and its PLL. */
- musb_dsps_phy_control(glue, pdev->id, 1);
+ usb_phy_init(musb->xceiv);
musb->isr = dsps_interrupt;
@@ -459,10 +460,7 @@ static int dsps_musb_exit(struct musb *musb)
del_timer_sync(&glue->timer[pdev->id]);
/* Shutdown the on-chip PHY and its PLL. */
- musb_dsps_phy_control(glue, pdev->id, 0);
-
- /* NOP driver needs change if supporting dual instance */
- usb_put_phy(musb->xceiv);
+ usb_phy_shutdown(musb->xceiv);
return 0;
}
@@ -690,10 +688,13 @@ static int dsps_suspend(struct device *dev)
struct platform_device *pdev = to_platform_device(dev->parent);
struct dsps_glue *glue = platform_get_drvdata(pdev);
const struct dsps_musb_wrapper *wrp = glue->wrp;
+ struct musb *musb;
int i;
- for (i = 0; i < wrp->instances; i++)
- musb_dsps_phy_control(glue, i, 0);
+ for (i = 0; i < wrp->instances; i++) {
+ musb = dev_get_drvdata(&glue->musb[i]->dev);
+ usb_phy_set_suspend(musb->xceiv, 1);
+ }
return 0;
}
@@ -703,10 +704,13 @@ static int dsps_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev->parent);
struct dsps_glue *glue = platform_get_drvdata(pdev);
const struct dsps_musb_wrapper *wrp = glue->wrp;
+ struct musb *musb;
int i;
- for (i = 0; i < wrp->instances; i++)
- musb_dsps_phy_control(glue, i, 1);
+ for (i = 0; i < wrp->instances; i++) {
+ musb = dev_get_drvdata(&glue->musb[i]->dev);
+ usb_phy_set_suspend(musb->xceiv, 0);
+ }
return 0;
}
--
1.7.0.4
next prev parent reply other threads:[~2013-06-11 7:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 7:17 [PATCH v2 0/7] adding dual instance and usb-phy support for am335x platform Ravi Babu
2013-06-11 7:17 ` [PATCH v2 1/7] usb: musb: dsps: enable dual instance support for am33xx platform Ravi Babu
2013-06-11 7:17 ` [PATCH v2 2/7] usb: phy: dsps: adding usbphy driver " Ravi Babu
2013-06-11 8:40 ` Kishon Vijay Abraham I
2013-06-11 9:45 ` B, Ravi
2013-06-11 18:52 ` Sergei Shtylyov
2013-06-12 7:20 ` B, Ravi
2013-06-12 7:22 ` B, Ravi
2013-06-11 7:17 ` [PATCH v2 3/7] usb: musb: dsps: remove nop_xceiv_(un)register APIs from dsps glue Ravi Babu
2013-06-11 7:17 ` Ravi Babu [this message]
2013-06-11 7:17 ` [PATCH v2 5/7] usb: musb: dsps: use get-usb-phy by phandle for multi instance Ravi Babu
2013-06-11 7:17 ` [PATCH v2 6/7] usb: phy: dts: Adding usbphy DT bindings for am33xx Ravi Babu
2013-06-11 7:17 ` [PATCH v2 7/7] usb: musb: dsp: remove the usb-phy control acess from platform glue Ravi Babu
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=1370935072-21056-5-git-send-email-ravibabu@ti.com \
--to=ravibabu@ti.com \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.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
all inboxes | Powered by JetHome®