Merge branch 'nop-phy-rename' into next

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
	drivers/usb/phy/phy-generic.c

diff --cc drivers/usb/dwc3/dwc3-exynos.c
Simple merge

diff --cc drivers/usb/dwc3/dwc3-pci.c
Simple merge

diff --cc drivers/usb/musb/am35x.c
Simple merge

diff --cc drivers/usb/musb/blackfin.c
Simple merge

diff --cc drivers/usb/musb/da8xx.c
Simple merge

diff --cc drivers/usb/musb/davinci.c
Simple merge

diff --cc drivers/usb/musb/musb_dsps.c
Simple merge

diff --cc drivers/usb/musb/tusb6010.c
Simple merge

diff --cc drivers/usb/phy/phy-generic.c
index f52b7f89eef1eeabf303333db2b8127d06f9d4c1,f379b7ded03734f7b73daff96b097b164bb1ba47..406f8e43f852a4448a3fbd7e429bda32802c05e1
--- 1/drivers/usb/phy/phy-nop.c
--- 2/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@@ -139,12 -139,11 +139,12 @@@ static int nop_set_host(struct usb_otg 
        return 0;
  }
  
- static int nop_usb_xceiv_probe(struct platform_device *pdev)
+ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
  {
        struct device *dev = &pdev->dev;
-       struct nop_usb_xceiv_platform_data *pdata =
 -      struct usb_phy_gen_xceiv_platform_data *pdata = pdev->dev.platform_data;
++      struct usb_phy_gen_xceiv_platform_data *pdata =
 +                      dev_get_platdata(&pdev->dev);
-       struct nop_usb_xceiv    *nop;
+       struct usb_phy_gen_xceiv        *nop;
        enum usb_phy_type       type = USB_PHY_TYPE_USB2;
        int err;
        u32 clk_rate = 0;