From: kishon@ti.com (Kishon Vijay Abraham I)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/6] drivers: usb: musb: omap: make use of the new PHY lib APIs
Date: Fri, 25 Jan 2013 08:03:24 +0530 [thread overview]
Message-ID: <1359081206-5602-5-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1359081206-5602-1-git-send-email-kishon@ti.com>
New PHY lib APIs like usb_add_phy_dev() and devm_usb_get_phy_dev() are
used in MUSB (OMAP), in order to make use of the binding information
provided in the board file (of OMAP platforms).
All the platforms should be modified similar to this to add and get the
PHY.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/usb/musb/omap2430.c | 2 +-
drivers/usb/otg/twl4030-usb.c | 3 ++-
drivers/usb/phy/omap-usb2.c | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 88a601b..be6d259 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -345,7 +345,7 @@ 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.
*/
- musb->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+ musb->xceiv = devm_usb_get_phy_dev(dev, 0);
if (IS_ERR_OR_NULL(musb->xceiv)) {
pr_err("HS USB OTG: no transceiver configured\n");
return -ENODEV;
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index 0a70193..a994715 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -610,6 +610,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
twl->phy.dev = twl->dev;
twl->phy.label = "twl4030";
twl->phy.otg = otg;
+ twl->phy.type = USB_PHY_TYPE_USB2;
twl->phy.set_suspend = twl4030_set_suspend;
otg->phy = &twl->phy;
@@ -624,7 +625,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "ldo init failed\n");
return err;
}
- usb_add_phy(&twl->phy, USB_PHY_TYPE_USB2);
+ usb_add_phy_dev(&twl->phy);
platform_set_drvdata(pdev, twl);
if (device_create_file(&pdev->dev, &dev_attr_vbus))
diff --git a/drivers/usb/phy/omap-usb2.c b/drivers/usb/phy/omap-usb2.c
index c2b4c8e..0cd88ac 100644
--- a/drivers/usb/phy/omap-usb2.c
+++ b/drivers/usb/phy/omap-usb2.c
@@ -142,6 +142,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
phy->phy.label = "omap-usb2";
phy->phy.set_suspend = omap_usb2_suspend;
phy->phy.otg = otg;
+ phy->phy.type = USB_PHY_TYPE_USB2;
phy->control_dev = omap_get_control_dev();
if (IS_ERR(phy->control_dev)) {
@@ -165,7 +166,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
}
clk_prepare(phy->wkupclk);
- usb_add_phy(&phy->phy, USB_PHY_TYPE_USB2);
+ usb_add_phy_dev(&phy->phy);
platform_set_drvdata(pdev, phy);
--
1.7.9.5
next prev parent reply other threads:[~2013-01-25 2:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 2:33 [PATCH v2 0/6] USB: Add support for multiple PHYs of same type Kishon Vijay Abraham I
2013-01-25 2:33 ` [PATCH v2 1/6] usb: otg: Add an API to bind the USB controller and PHY Kishon Vijay Abraham I
2013-01-25 13:19 ` Roger Quadros
2013-02-01 21:13 ` Marc Kleine-Budde
2013-02-02 11:32 ` kishon
2013-01-25 2:33 ` [PATCH v2 2/6] usb: otg: utils: add facilities in phy lib to support multiple PHYs of same type Kishon Vijay Abraham I
2013-01-25 13:34 ` Roger Quadros
2013-02-01 21:54 ` Marc Kleine-Budde
2013-01-25 2:33 ` [PATCH v2 3/6] ARM: OMAP: USB: Add phy binding information Kishon Vijay Abraham I
2013-02-01 19:18 ` Tony Lindgren
2013-01-25 2:33 ` Kishon Vijay Abraham I [this message]
2013-01-25 2:33 ` [PATCH v2 5/6] usb: otg: add device tree support to otg library Kishon Vijay Abraham I
2013-01-25 2:33 ` [PATCH v2 6/6] USB: MUSB: OMAP: get PHY by phandle for dt boot 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=1359081206-5602-5-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).