1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index b3aa0184af9a..0a34dd859555 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -32,7 +32,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <linux/usb/usb_phy_gen_xceiv.h>
+#include <linux/usb/usb_phy_generic.h>
 #include <linux/platform_data/usb-omap.h>
 
 #include "musb_core.h"
@@ -85,6 +85,7 @@
 struct am35x_glue {
         struct device           *dev;
         struct platform_device  *musb;
+        struct platform_device  *phy;
         struct clk              *phy_clk;
         struct clk              *clk;
 };
@@ -360,7 +361,6 @@ static int am35x_musb_init(struct musb *musb)
         if (!rev)
                 return -ENODEV;
 
-        usb_nop_xceiv_register();
         musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
         if (IS_ERR_OR_NULL(musb->xceiv))
                 return -EPROBE_DEFER;
@@ -402,7 +402,6 @@ static int am35x_musb_exit(struct musb *musb)
                 data->set_phy_power(0);
 
         usb_put_phy(musb->xceiv);
-        usb_nop_xceiv_unregister();
 
         return 0;
 }
@@ -505,6 +504,9 @@ static int am35x_probe(struct platform_device *pdev)
 
         pdata->platform_ops             = &am35x_ops;
 
+        glue->phy = usb_phy_generic_register();
+        if (IS_ERR(glue->phy))
+                goto err7;
         platform_set_drvdata(pdev, glue);
 
         pinfo = am35x_dev_info;
@@ -518,11 +520,14 @@ static int am35x_probe(struct platform_device *pdev)
         if (IS_ERR(musb)) {
                 ret = PTR_ERR(musb);
                 dev_err(&pdev->dev, "failed to register musb device: %d\n", ret);
-                goto err7;
+                goto err8;
         }
 
         return 0;
 
+err8:
+        usb_phy_generic_unregister(glue->phy);
+
 err7:
         clk_disable(clk);
 
@@ -547,6 +552,7 @@ static int am35x_remove(struct platform_device *pdev)
         struct am35x_glue       *glue = platform_get_drvdata(pdev);
 
         platform_device_unregister(glue->musb);
+        usb_phy_generic_unregister(glue->phy);
         clk_disable(glue->clk);
         clk_disable(glue->phy_clk);
         clk_put(glue->clk);