From: Felipe Balbi <balbi@ti.com>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: <grant.likely@linaro.org>, <tony@atomide.com>, <balbi@ti.com>,
<arnd@arndb.de>, <swarren@nvidia.com>,
<sylvester.nawrocki@gmail.com>, <linux-kernel@vger.kernel.org>,
<linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-usb@vger.kernel.org>, <gregkh@linuxfoundation.org>,
<akpm@linux-foundation.org>, <rob.herring@calxeda.com>,
<rob@landley.net>, <b-cousson@ti.com>, <linux@arm.linux.org.uk>,
<benoit.cousson@linaro.org>, <mchehab@redhat.com>,
<cesarb@cesarb.net>, <davem@davemloft.net>, <rnayak@ti.com>,
<shawn.guo@linaro.org>, <santosh.shilimkar@ti.com>,
<devicetree-discuss@lists.ozlabs.org>,
<linux-doc@vger.kernel.org>, <nsekhar@ti.com>
Subject: Re: [PATCH v7 7/9] usb: musb: omap2430: use the new generic PHY framework
Date: Tue, 18 Jun 2013 12:47:03 +0300 [thread overview]
Message-ID: <20130618094703.GV5461@arwen.pp.htv.fi> (raw)
In-Reply-To: <1371113039-5784-8-git-send-email-kishon@ti.com>
[-- Attachment #1: Type: text/plain, Size: 3808 bytes --]
Hi,
On Thu, Jun 13, 2013 at 02:13:57PM +0530, Kishon Vijay Abraham I wrote:
> 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/get_sync and
> power_off/put_sync 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>
> ---
> drivers/usb/musb/musb_core.c | 1 +
> drivers/usb/musb/musb_core.h | 3 +++
> drivers/usb/musb/omap2430.c | 29 +++++++++++++++++++++--------
> 3 files changed, 25 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index 37a261a..f732bcc 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -1864,6 +1864,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
> musb->board_set_power = plat->set_power;
> musb->min_power = plat->min_power;
> musb->ops = plat->platform_ops;
> + 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 7fb4819..498ae21 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;
> @@ -357,6 +358,7 @@ struct musb {
> u16 int_tx;
>
> struct usb_phy *xceiv;
> + struct phy *phy;
>
> int nIrq;
> unsigned irq_wake:1;
> @@ -434,6 +436,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 628b93f..c62a004 100644
> --- a/drivers/usb/musb/omap2430.c
> +++ b/drivers/usb/musb/omap2430.c
> @@ -348,14 +348,24 @@ 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);
> + if (IS_ERR(musb->xceiv) || IS_ERR(musb->phy)) {
> + status = PTR_ERR(musb->xceiv) | PTR_ERR(musb->phy);
>
> if (status == -ENXIO)
> return status;
> @@ -397,9 +407,10 @@ 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);
> + phy_pm_runtime_put(musb->phy);
see, weird unbalanced calls :-)
Make it all explicit:
phy_pm_runtime_get_sync(phy);
phy_init(phy);
phy_pm_runtime_put(phy);
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-06-18 9:49 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 8:43 [PATCH v7 0/9] Generic PHY Framework Kishon Vijay Abraham I
2013-06-13 8:43 ` [PATCH v7 1/9] drivers: phy: add generic PHY framework Kishon Vijay Abraham I
2013-06-18 9:38 ` Felipe Balbi
2013-06-18 21:22 ` Sylwester Nawrocki
2013-06-24 6:37 ` Kishon Vijay Abraham I
2013-06-19 15:49 ` Sylwester Nawrocki
2013-06-20 5:28 ` Kishon Vijay Abraham I
2013-06-13 8:43 ` [PATCH v7 2/9] usb: phy: omap-usb2: use the new " Kishon Vijay Abraham I
2013-06-18 9:40 ` Felipe Balbi
2013-06-18 9:49 ` Kishon Vijay Abraham I
2013-06-18 9:50 ` Felipe Balbi
2013-06-18 9:56 ` Kishon Vijay Abraham I
2013-06-18 10:00 ` Felipe Balbi
2013-06-13 8:43 ` [PATCH v7 3/9] usb: phy: twl4030: " Kishon Vijay Abraham I
2013-06-18 9:42 ` Felipe Balbi
2013-06-13 8:43 ` [PATCH v7 4/9] usb: phy: twl4030: twl4030 shouldn't be subsys_initcall Kishon Vijay Abraham I
2013-06-18 9:43 ` Felipe Balbi
2013-06-13 8:43 ` [PATCH v7 5/9] ARM: OMAP: USB: Add phy binding information Kishon Vijay Abraham I
2013-06-18 9:44 ` Felipe Balbi
2013-06-18 10:04 ` Kishon Vijay Abraham I
2013-06-18 10:27 ` Felipe Balbi
2013-06-18 11:13 ` Kishon Vijay Abraham I
2013-06-18 12:35 ` Felipe Balbi
2013-06-18 14:55 ` Kishon Vijay Abraham I
2013-06-18 14:57 ` Felipe Balbi
2013-06-13 8:43 ` [PATCH v7 6/9] ARM: dts: omap: update usb_otg_hs data Kishon Vijay Abraham I
2013-06-18 9:45 ` Felipe Balbi
2013-06-13 8:43 ` [PATCH v7 7/9] usb: musb: omap2430: use the new generic PHY framework Kishon Vijay Abraham I
2013-06-18 9:47 ` Felipe Balbi [this message]
2013-06-24 5:31 ` Kishon Vijay Abraham I
2013-06-24 6:37 ` Felipe Balbi
2013-06-13 8:43 ` [PATCH v7 8/9] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2 Kishon Vijay Abraham I
2013-06-18 9:47 ` Felipe Balbi
2013-06-13 8:43 ` [PATCH v7 9/9] usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops Kishon Vijay Abraham I
2013-06-18 9:47 ` Felipe Balbi
2013-06-17 10:16 ` [PATCH v7 0/9] Generic PHY Framework Sylwester Nawrocki
2013-06-18 9:49 ` Felipe Balbi
2013-06-24 19:27 ` Sylwester Nawrocki
2013-06-24 19:34 ` Felipe Balbi
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=20130618094703.GV5461@arwen.pp.htv.fi \
--to=balbi@ti.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=b-cousson@ti.com \
--cc=benoit.cousson@linaro.org \
--cc=cesarb@cesarb.net \
--cc=davem@davemloft.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mchehab@redhat.com \
--cc=nsekhar@ti.com \
--cc=rnayak@ti.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=santosh.shilimkar@ti.com \
--cc=shawn.guo@linaro.org \
--cc=swarren@nvidia.com \
--cc=sylvester.nawrocki@gmail.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).