From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>, <kyungmin.park@samsung.com>,
<balbi@ti.com>, <kishon@ti.com>, <jg1.han@samsung.com>,
<s.nawrocki@samsung.com>, <kgene.kim@samsung.com>
Cc: <grant.likely@linaro.org>, <tony@atomide.com>, <arnd@arndb.de>,
<swarren@nvidia.com>, <devicetree-discuss@lists.ozlabs.org>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-samsung-soc@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<linux-usb@vger.kernel.org>, <linux-media@vger.kernel.org>,
<linux-fbdev@vger.kernel.org>, <akpm@linux-foundation.org>,
<balajitk@ti.com>, <george.cherian@ti.com>, <nsekhar@ti.com>
Subject: [PATCH 06/15] usb: musb: omap2430: use the new generic PHY framework
Date: Thu, 18 Jul 2013 12:16:15 +0530 [thread overview]
Message-ID: <1374129984-765-7-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1374129984-765-1-git-send-email-kishon@ti.com>
Use the generic PHY framework API to get the PHY. The usb_phy_set_resume
and usb_phy_set_suspend is replaced with power_on and
power_off to align with the new PHY framework.
musb->xceiv can't be removed as of now because musb core uses xceiv.state and
xceiv.otg. Once there is a separate state machine to handle otg, these can be
moved out of xceiv and then we can start using the generic PHY framework.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Felipe Balbi <balbi@ti.com>
---
drivers/usb/musb/Kconfig | 1 +
drivers/usb/musb/musb_core.c | 1 +
drivers/usb/musb/musb_core.h | 3 +++
drivers/usb/musb/omap2430.c | 26 ++++++++++++++++++++------
4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 797e3fd..01381ac 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -76,6 +76,7 @@ config USB_MUSB_TUSB6010
config USB_MUSB_OMAP2PLUS
tristate "OMAP2430 and onwards"
depends on ARCH_OMAP2PLUS
+ depends on GENERIC_PHY
config USB_MUSB_AM35X
tristate "AM35x"
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 29a24ce..cca12c0 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1814,6 +1814,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
musb->min_power = plat->min_power;
musb->ops = plat->platform_ops;
musb->port_mode = plat->mode;
+ musb->phy_label = plat->phy_label;
/* The musb_platform_init() call:
* - adjusts musb->mregs
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 7d341c3..8f017ab 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -46,6 +46,7 @@
#include <linux/usb.h>
#include <linux/usb/otg.h>
#include <linux/usb/musb.h>
+#include <linux/phy/phy.h>
struct musb;
struct musb_hw_ep;
@@ -346,6 +347,7 @@ struct musb {
u16 int_tx;
struct usb_phy *xceiv;
+ struct phy *phy;
int nIrq;
unsigned irq_wake:1;
@@ -424,6 +426,7 @@ struct musb {
unsigned double_buffer_not_ok:1;
struct musb_hdrc_config *config;
+ const char *phy_label;
#ifdef MUSB_CONFIG_PROC_FS
struct proc_dir_entry *proc_entry;
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 6708a3b..87dac0f 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -348,11 +348,21 @@ static int omap2430_musb_init(struct musb *musb)
* up through ULPI. TWL4030-family PMICs include one,
* which needs a driver, drivers aren't always needed.
*/
- if (dev->parent->of_node)
+ if (dev->parent->of_node) {
+ musb->phy = devm_phy_get(dev->parent, "usb2-phy");
+
+ /* We can't totally remove musb->xceiv as of now because
+ * musb core uses xceiv.state and xceiv.otg. Once we have
+ * a separate state machine to handle otg, these can be moved
+ * out of xceiv and then we can start using the generic PHY
+ * framework
+ */
musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent,
"usb-phy", 0);
- else
+ } else {
musb->xceiv = devm_usb_get_phy_dev(dev, 0);
+ musb->phy = devm_phy_get(dev, musb->phy_label);
+ }
if (IS_ERR(musb->xceiv)) {
status = PTR_ERR(musb->xceiv);
@@ -364,6 +374,10 @@ static int omap2430_musb_init(struct musb *musb)
return -EPROBE_DEFER;
}
+ if (IS_ERR(musb->phy)) {
+ pr_err("HS USB OTG: no PHY configured\n");
+ return PTR_ERR(musb->phy);
+ }
musb->isr = omap2430_musb_interrupt;
status = pm_runtime_get_sync(dev);
@@ -397,7 +411,7 @@ static int omap2430_musb_init(struct musb *musb)
if (glue->status != OMAP_MUSB_UNKNOWN)
omap_musb_set_mailbox(glue);
- usb_phy_init(musb->xceiv);
+ phy_init(musb->phy);
pm_runtime_put_noidle(musb->controller);
return 0;
@@ -460,6 +474,7 @@ static int omap2430_musb_exit(struct musb *musb)
del_timer_sync(&musb_idle_timer);
omap2430_low_level_exit(musb);
+ phy_exit(musb->phy);
return 0;
}
@@ -633,7 +648,7 @@ static int omap2430_runtime_suspend(struct device *dev)
OTG_INTERFSEL);
omap2430_low_level_exit(musb);
- usb_phy_set_suspend(musb->xceiv, 1);
+ phy_power_off(musb->phy);
}
return 0;
@@ -648,8 +663,7 @@ static int omap2430_runtime_resume(struct device *dev)
omap2430_low_level_init(musb);
musb_writel(musb->mregs, OTG_INTERFSEL,
musb->context.otg_interfsel);
-
- usb_phy_set_suspend(musb->xceiv, 0);
+ phy_power_on(musb->phy);
}
return 0;
--
1.7.10.4
next prev parent reply other threads:[~2013-07-18 6:47 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-18 6:46 [PATCH 00/15] PHY framework Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 01/15] drivers: phy: add generic " Kishon Vijay Abraham I
2013-07-18 7:20 ` Greg KH
2013-07-18 8:59 ` Kishon Vijay Abraham I
2013-07-18 15:49 ` Greg KH
2013-07-19 5:37 ` Kishon Vijay Abraham I
2013-07-19 5:43 ` Greg KH
2013-07-19 5:55 ` Kishon Vijay Abraham I
2013-07-19 6:29 ` Greg KH
2013-07-19 6:36 ` Kishon Vijay Abraham I
2013-07-19 15:54 ` Stephen Warren
2013-07-20 3:15 ` Kishon Vijay Abraham I
2013-07-19 23:50 ` Greg KH
2013-07-20 3:19 ` Kishon Vijay Abraham I
2013-07-20 22:00 ` Greg KH
2013-07-21 2:32 ` Alan Stern
2013-07-21 2:59 ` Greg KH
2013-07-21 10:22 ` Sascha Hauer
2013-07-21 15:48 ` Greg KH
2013-07-21 17:14 ` Sylwester Nawrocki
2013-07-21 19:22 ` Alan Stern
2013-07-22 7:25 ` Kishon Vijay Abraham I
2013-07-22 14:44 ` Alan Stern
2013-07-23 5:47 ` Kishon Vijay Abraham I
2013-07-23 7:29 ` Tomasz Figa
2013-07-23 7:55 ` Tomasz Figa
2013-07-23 14:37 ` Alan Stern
2013-07-23 14:50 ` Tomasz Figa
2013-07-23 15:18 ` Kishon Vijay Abraham I
2013-07-23 16:18 ` Greg KH
2013-07-23 16:28 ` Kishon Vijay Abraham I
2013-07-23 16:35 ` Greg KH
2013-07-23 16:50 ` Tomasz Figa
2013-07-23 17:37 ` Greg KH
2013-07-23 17:44 ` Mark Brown
2013-07-23 18:01 ` Greg KH
2013-07-23 19:31 ` Mark Brown
2013-07-23 19:44 ` Greg KH
2013-07-23 20:07 ` Tomasz Figa
2013-07-23 20:50 ` Greg KH
2013-07-23 21:05 ` Tomasz Figa
2013-07-23 21:23 ` Greg KH
2013-07-23 23:48 ` Mark Brown
2013-07-23 17:48 ` Tomasz Figa
2013-07-23 18:04 ` Greg KH
2013-07-23 20:46 ` Tomasz Figa
2013-07-23 19:36 ` Alan Stern
2013-07-23 20:20 ` Tomasz Figa
2013-07-23 20:53 ` Alan Stern
2013-07-23 21:02 ` Tomasz Figa
2013-07-23 21:14 ` Alan Stern
2013-07-23 21:31 ` Tomasz Figa
2013-07-24 18:32 ` Arnd Bergmann
[not found] ` <51F0B373.5050907@ti.com>
2013-07-25 7:54 ` Arnd Bergmann
2013-07-25 9:29 ` Sylwester Nawrocki
2013-07-25 9:29 ` Mark Brown
2013-07-25 10:16 ` Laurent Pinchart
2013-07-25 11:00 ` Arnd Bergmann
2013-07-25 11:10 ` Laurent Pinchart
2013-07-25 12:09 ` Mark Brown
2013-07-23 17:34 ` Mark Brown
2013-07-22 15:04 ` Greg KH
2013-07-23 5:34 ` Kishon Vijay Abraham I
2013-07-21 10:31 ` Tomasz Figa
2013-07-21 11:07 ` Kishon Vijay Abraham I
2013-07-21 11:12 ` Tomasz Figa
2013-07-21 15:46 ` Greg KH
2013-07-30 7:11 ` Felipe Balbi
2013-07-31 5:44 ` Kishon Vijay Abraham I
2013-07-31 6:15 ` Felipe Balbi
2013-08-13 10:44 ` Kishon Vijay Abraham I
2013-08-13 11:37 ` Tomasz Figa
2013-08-13 12:05 ` Kishon Vijay Abraham I
2013-08-13 22:19 ` Sylwester Nawrocki
2013-08-13 23:04 ` Tomasz Figa
2013-08-14 15:05 ` Kishon Vijay Abraham I
2013-08-19 5:28 ` Kishon Vijay Abraham I
2013-08-20 12:26 ` Felipe Balbi
2013-07-18 6:46 ` [PATCH 02/15] usb: phy: omap-usb2: use the new " Kishon Vijay Abraham I
2013-07-18 7:21 ` Greg KH
2013-07-18 9:00 ` Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 03/15] usb: phy: twl4030: " Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 04/15] ARM: OMAP: USB: Add phy binding information Kishon Vijay Abraham I
2013-07-18 7:02 ` Tony Lindgren
2013-07-18 6:46 ` [PATCH 05/15] ARM: dts: omap: update usb_otg_hs data Kishon Vijay Abraham I
2013-07-18 7:05 ` Tony Lindgren
2013-07-18 6:46 ` Kishon Vijay Abraham I [this message]
2013-07-18 6:46 ` [PATCH 07/15] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2 Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 08/15] usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 09/15] phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 10/15] video: exynos_mipi_dsim: Use the generic PHY driver Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 11/15] exynos4-is: Use the generic MIPI CSIS " Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 12/15] ARM: Samsung: Remove the MIPI PHY setup code Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 13/15] phy: Add driver for Exynos DP PHY Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 14/15] video: exynos_dp: remove non-DT support for Exynos Display Port Kishon Vijay Abraham I
2013-07-18 6:46 ` [PATCH 15/15] video: exynos_dp: Use the generic PHY driver Kishon Vijay Abraham I
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=1374129984-765-7-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=balajitk@ti.com \
--cc=balbi@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=george.cherian@ti.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jg1.han@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=s.nawrocki@samsung.com \
--cc=swarren@nvidia.com \
--cc=tony@atomide.com \
/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).