From: rogerq@ti.com (Roger Quadros)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v1 4/6] drivers: usb: musb: omap: make use of the new PHY lib APIs
Date: Tue, 22 Jan 2013 16:09:42 +0200 [thread overview]
Message-ID: <50FE9DA6.4030507@ti.com> (raw)
In-Reply-To: <1358848694-20145-5-git-send-email-kishon@ti.com>
On 01/22/2013 11:58 AM, Kishon Vijay Abraham I wrote:
> 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 bf6cfe0..1a8cf6d 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;
What is the need to set phy.type? I think this should be deprecated along with the old API.
> 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 4b59b39..b5c759c 100644
> --- a/drivers/usb/phy/omap-usb2.c
> +++ b/drivers/usb/phy/omap-usb2.c
> @@ -143,6 +143,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;
same here.
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>
> @@ -168,7 +169,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);
>
>
--
cheers,
-roger
next prev parent reply other threads:[~2013-01-22 14:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-22 9:58 [PATCH v1 0/6] USB: Add support for multiple PHYs of same type Kishon Vijay Abraham I
2013-01-22 9:58 ` [PATCH v1 1/6] usb: otg: Add an API to bind the USB controller and PHY Kishon Vijay Abraham I
2013-01-22 9:58 ` [PATCH v1 2/6] usb: otg: utils: add facilities in phy lib to support multiple PHYs of same type Kishon Vijay Abraham I
2013-01-22 14:07 ` Roger Quadros
2013-01-22 14:13 ` kishon
2013-01-22 9:58 ` [PATCH v1 3/6] ARM: OMAP: USB: Add phy binding information Kishon Vijay Abraham I
2013-01-22 9:58 ` [PATCH v1 4/6] drivers: usb: musb: omap: make use of the new PHY lib APIs Kishon Vijay Abraham I
2013-01-22 14:09 ` Roger Quadros [this message]
2013-01-24 18:58 ` kishon
2013-01-22 9:58 ` [PATCH v1 5/6] usb: otg: add device tree support to otg library Kishon Vijay Abraham I
2013-01-22 10:36 ` Mark Rutland
2013-01-22 15:37 ` kishon
2013-01-22 9:58 ` [PATCH v1 6/6] USB: MUSB: OMAP: get PHY by phandle for dt boot Kishon Vijay Abraham I
2013-01-22 14:17 ` Roger Quadros
2013-01-22 14:37 ` kishon
2013-01-22 14:47 ` Roger Quadros
2013-01-22 15:21 ` kishon
2013-01-22 15:38 ` Peter Ujfalusi
2013-01-22 15:40 ` kishon
2013-01-22 15:41 ` [PATCH v1 0/6] USB: Add support for multiple PHYs of same type Koen Kooi
2013-01-22 15:45 ` kishon
2013-01-22 16:16 ` kishon
2013-01-22 17:02 ` Koen Kooi
2013-01-23 5:19 ` kishon
2013-01-23 13:58 ` Mohammed, Afzal
2013-01-23 14:26 ` kishon
2013-01-24 11:51 ` Mohammed, Afzal
2013-01-25 14:46 ` Mohammed, Afzal
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=50FE9DA6.4030507@ti.com \
--to=rogerq@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).