From: Kishon Vijay Abraham I <kishon@ti.com>
To: tony@atomide.com, linux-arm-kernel@lists.infradead.org,
linux-omap@vger.kernel.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: linux@arm.linux.org.uk, eballetbo@gmail.com,
gregkh@linuxfoundation.org, balbi@ti.com, kishon@ti.com,
javier@dowhile0.org
Subject: [PATCH 3/4] usb: musb: omap: use the new API to get PHY reference by label
Date: Wed, 19 Jun 2013 14:22:30 +0530 [thread overview]
Message-ID: <1371631951-369-4-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1371631951-369-1-git-send-email-kishon@ti.com>
After the devices are created using PLATFORM_DEVID_AUTO,
devm_usb_get_phy_dev and usb_get_phy_dev can't be used reliably
as it relies on the device_names passed in usb_bind_phy. So used the
new API devm_usb_get_phy_by_name to get the PHY reference.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/usb/musb/musb_core.c | 1 +
drivers/usb/musb/musb_core.h | 1 +
drivers/usb/musb/omap2430.c | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 37a261a..00fbaf4 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_name = plat->phy_name;
/* 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..e9a9339 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -434,6 +434,7 @@ struct musb {
unsigned double_buffer_not_ok:1;
struct musb_hdrc_config *config;
+ const char *phy_name;
#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..f872ebc 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -352,7 +352,7 @@ static int omap2430_musb_init(struct musb *musb)
musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent,
"usb-phy", 0);
else
- musb->xceiv = devm_usb_get_phy_dev(dev, 0);
+ musb->xceiv = devm_usb_get_phy_by_name(dev, musb->phy_name);
if (IS_ERR(musb->xceiv)) {
status = PTR_ERR(musb->xceiv);
--
1.7.10.4
next prev parent reply other threads:[~2013-06-19 8:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 8:52 [PATCH 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I
2013-06-19 8:52 ` [PATCH 1/4] arm: omap: Add phy binding info for musb in plat data Kishon Vijay Abraham I
2013-07-04 11:44 ` Tony Lindgren
2013-07-04 12:10 ` Kishon Vijay Abraham I
2013-06-19 8:52 ` [PATCH 2/4] usb: phy: add a new API to get PHY ref by label Kishon Vijay Abraham I
2013-06-19 8:52 ` Kishon Vijay Abraham I [this message]
2013-06-19 8:52 ` [PATCH 4/4] arm: omap: remove using usb_bind_phy for binding musb and phy 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=1371631951-369-4-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=balbi@ti.com \
--cc=eballetbo@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=javier@dowhile0.org \
--cc=linux-arm-kernel@lists.infradead.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=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).