usb: musb: omap: make use of the new PHY lib APIs

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>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 779862d..23df9d7 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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);