[PATCH v3 3/3] usb: s3c-hsotg: Use the new Exynos USB phy driver with the generic phy framework

[Kamil Debski]

Change the used phy driver to the new Exynos USB phy driver that uses the
generic phy framework.

Signed-off-by: Kamil Debski <k.deb...@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com>
---
 drivers/usb/gadget/s3c-hsotg.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index bb31262..dc7f20c 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -31,6 +31,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/phy/phy.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -162,7 +163,7 @@ struct s3c_hsotg_ep {
 struct s3c_hsotg {
        struct device            *dev;
        struct usb_gadget_driver *driver;
-       struct usb_phy          *phy;
+       struct phy               *phy;
        struct s3c_hsotg_plat    *plat;
 
        spinlock_t              lock;
@@ -2905,9 +2906,10 @@ static void s3c_hsotg_phy_enable(struct s3c_hsotg *hsotg)
        dev_dbg(hsotg->dev, "pdev 0x%p\n", pdev);
 
        if (hsotg->phy)
-               usb_phy_init(hsotg->phy);
+               phy_power_on(hsotg->phy);
        else if (hsotg->plat->phy_init)
                hsotg->plat->phy_init(pdev, hsotg->plat->phy_type);
+
 }
 
 /**
@@ -2922,7 +2924,7 @@ static void s3c_hsotg_phy_disable(struct s3c_hsotg *hsotg)
        struct platform_device *pdev = to_platform_device(hsotg->dev);
 
        if (hsotg->phy)
-               usb_phy_shutdown(hsotg->phy);
+               phy_power_off(hsotg->phy);
        else if (hsotg->plat->phy_exit)
                hsotg->plat->phy_exit(pdev, hsotg->plat->phy_type);
 }
@@ -3529,7 +3531,7 @@ static void s3c_hsotg_delete_debug(struct s3c_hsotg 
*hsotg)
 static int s3c_hsotg_probe(struct platform_device *pdev)
 {
        struct s3c_hsotg_plat *plat = dev_get_platdata(&pdev->dev);
-       struct usb_phy *phy;
+       struct phy *phy;
        struct device *dev = &pdev->dev;
        struct s3c_hsotg_ep *eps;
        struct s3c_hsotg *hsotg;
@@ -3544,7 +3546,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+       phy = devm_phy_get(&pdev->dev, "device");
        if (IS_ERR(phy)) {
                /* Fallback for pdata */
                plat = dev_get_platdata(&pdev->dev);
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/