usb: phy: rename all phy drivers to phy-$name-usb.c

this will make sure that we have sensible names
for all phy drivers. Current situation was already
quite bad with too generic names being used.

Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index d10a8b387ffe7a58c111c587cc8be69bc7a4a43e..5fb4a5d55945fd151a0d8c24ba958d4e5fb3fff9 100644 (file)
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -8,24 +8,24 @@ obj-$(CONFIG_USB_PHY)                 += phy.o
 
 # transceiver drivers, keep the list sorted
 
-obj-$(CONFIG_AB8500_USB)               += ab8500-usb.o
-fsl_usb2_otg-objs                      := fsl_otg.o otg_fsm.o
-obj-$(CONFIG_FSL_USB2_OTG)             += fsl_usb2_otg.o
-obj-$(CONFIG_ISP1301_OMAP)             += isp1301_omap.o
-obj-$(CONFIG_MV_U3D_PHY)               += mv_u3d_phy.o
-obj-$(CONFIG_NOP_USB_XCEIV)            += nop-usb-xceiv.o
-obj-$(CONFIG_OMAP_CONTROL_USB)         += omap-control-usb.o
-obj-$(CONFIG_OMAP_USB2)                        += omap-usb2.o
-obj-$(CONFIG_OMAP_USB3)                        += omap-usb3.o
-obj-$(CONFIG_SAMSUNG_USBPHY)           += samsung-usbphy.o
-obj-$(CONFIG_TWL4030_USB)              += twl4030-usb.o
-obj-$(CONFIG_TWL6030_USB)              += twl6030-usb.o
-obj-$(CONFIG_USB_EHCI_TEGRA)           += tegra_usb_phy.o
-obj-$(CONFIG_USB_GPIO_VBUS)            += gpio_vbus.o
-obj-$(CONFIG_USB_ISP1301)              += isp1301.o
-obj-$(CONFIG_USB_MSM_OTG)              += msm_otg.o
-obj-$(CONFIG_USB_MV_OTG)               += mv_otg.o
-obj-$(CONFIG_USB_MXS_PHY)              += mxs-phy.o
-obj-$(CONFIG_USB_RCAR_PHY)             += rcar-phy.o
-obj-$(CONFIG_USB_ULPI)                 += ulpi.o
-obj-$(CONFIG_USB_ULPI_VIEWPORT)                += ulpi_viewport.o
+obj-$(CONFIG_AB8500_USB)               += phy-ab8500-usb.o
+phy-fsl-usb2-objs                      := phy-fsl-usb.o phy-fsm-usb.o
+obj-$(CONFIG_FSL_USB2_OTG)             += phy-fsl-usb2.o
+obj-$(CONFIG_ISP1301_OMAP)             += phy-isp1301.omap.o
+obj-$(CONFIG_MV_U3D_PHY)               += phy-mv-u3d-usb.o
+obj-$(CONFIG_NOP_USB_XCEIV)            += phy-nop.o
+obj-$(CONFIG_OMAP_CONTROL_USB)         += phy-omap-control.o
+obj-$(CONFIG_OMAP_USB2)                        += phy-omap-usb2.o
+obj-$(CONFIG_OMAP_USB3)                        += phy-omap-usb3.o
+obj-$(CONFIG_SAMSUNG_USBPHY)           += phy-samsung-usb.o
+obj-$(CONFIG_TWL4030_USB)              += phy-twl4030-usb.o
+obj-$(CONFIG_TWL6030_USB)              += phy-twl6030-usb.o
+obj-$(CONFIG_USB_EHCI_TEGRA)           += phy-tegra-usb.o
+obj-$(CONFIG_USB_GPIO_VBUS)            += phy-gpio-vbus-usb.o
+obj-$(CONFIG_USB_ISP1301)              += phy-isp1301.o
+obj-$(CONFIG_USB_MSM_OTG)              += phy-msm-usb.o
+obj-$(CONFIG_USB_MV_OTG)               += phy-mv-usb.o
+obj-$(CONFIG_USB_MXS_PHY)              += phy-mxs-usb.o
+obj-$(CONFIG_USB_RCAR_PHY)             += phy-rcar-usb.o
+obj-$(CONFIG_USB_ULPI)                 += phy-ulpi.o
+obj-$(CONFIG_USB_ULPI_VIEWPORT)                += phy-ulpi-viewport.o

diff --git a/drivers/usb/phy/ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
similarity index 100%
rename from drivers/usb/phy/ab8500-usb.c
rename to drivers/usb/phy/phy-ab8500-usb.c

diff --git a/drivers/usb/phy/fsl_otg.c b/drivers/usb/phy/phy-fsl-usb.c
similarity index 99%
rename from drivers/usb/phy/fsl_otg.c
rename to drivers/usb/phy/phy-fsl-usb.c
index 72a2a00c248702ee0548f38af2c47dbbe33ceec5..97b9308507c3dae718828645a79069c6af2de46e 100644 (file)
--- a/drivers/usb/phy/fsl_otg.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -43,7 +43,7 @@
 
 #include <asm/unaligned.h>
 
-#include "fsl_otg.h"
+#include "phy-fsl-usb.h"
 
 #define DRIVER_VERSION "Rev. 1.55"
 #define DRIVER_AUTHOR "Jerry Huang/Li Yang"

diff --git a/drivers/usb/phy/fsl_otg.h b/drivers/usb/phy/phy-fsl-usb.h
similarity index 100%
rename from drivers/usb/phy/fsl_otg.h
rename to drivers/usb/phy/phy-fsl-usb.h

diff --git a/drivers/usb/phy/otg_fsm.c b/drivers/usb/phy/phy-fsm-usb.c
similarity index 99%
rename from drivers/usb/phy/otg_fsm.c
rename to drivers/usb/phy/phy-fsm-usb.c
index 1f729a15decbbfc24b6a09f3ec88e625a69942f1..c520b3548e7cf59cd0058eda330cd2d7ac792197 100644 (file)
--- a/drivers/usb/phy/otg_fsm.c
+++ b/drivers/usb/phy/phy-fsm-usb.c
@@ -29,7 +29,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
 
-#include "otg_fsm.h"
+#include "phy-otg-fsm.h"
 
 /* Change USB protocol when there is a protocol change */
 static int otg_set_protocol(struct otg_fsm *fsm, int protocol)

diff --git a/drivers/usb/phy/otg_fsm.h b/drivers/usb/phy/phy-fsm-usb.h
similarity index 100%
rename from drivers/usb/phy/otg_fsm.h
rename to drivers/usb/phy/phy-fsm-usb.h

diff --git a/drivers/usb/phy/gpio_vbus.c b/drivers/usb/phy/phy-gpio-vbus-usb.c
similarity index 100%
rename from drivers/usb/phy/gpio_vbus.c
rename to drivers/usb/phy/phy-gpio-vbus-usb.c

diff --git a/drivers/usb/phy/isp1301_omap.c b/drivers/usb/phy/phy-isp1301-omap.c
similarity index 100%
rename from drivers/usb/phy/isp1301_omap.c
rename to drivers/usb/phy/phy-isp1301-omap.c

diff --git a/drivers/usb/phy/isp1301.c b/drivers/usb/phy/phy-isp1301.c
similarity index 100%
rename from drivers/usb/phy/isp1301.c
rename to drivers/usb/phy/phy-isp1301.c

diff --git a/drivers/usb/phy/msm_otg.c b/drivers/usb/phy/phy-msm-usb.c
similarity index 100%
rename from drivers/usb/phy/msm_otg.c
rename to drivers/usb/phy/phy-msm-usb.c

diff --git a/drivers/usb/phy/mv_u3d_phy.c b/drivers/usb/phy/phy-mv-u3d-usb.c
similarity index 99%
rename from drivers/usb/phy/mv_u3d_phy.c
rename to drivers/usb/phy/phy-mv-u3d-usb.c
index 9d8599122aa9abb424d469747fb50c28d9893dbd..cb7e70f17709d783fff47a6194077e4a0f408aef 100644 (file)
--- a/drivers/usb/phy/mv_u3d_phy.c
+++ b/drivers/usb/phy/phy-mv-u3d-usb.c
@@ -15,7 +15,7 @@
 #include <linux/usb/otg.h>
 #include <linux/platform_data/mv_usb.h>
 
-#include "mv_u3d_phy.h"
+#include "phy-mv-u3d-usb.h"
 
 /*
  * struct mv_u3d_phy - transceiver driver state

diff --git a/drivers/usb/phy/mv_u3d_phy.h b/drivers/usb/phy/phy-mv-u3d-usb.h
similarity index 100%
rename from drivers/usb/phy/mv_u3d_phy.h
rename to drivers/usb/phy/phy-mv-u3d-usb.h

diff --git a/drivers/usb/phy/mv_otg.c b/drivers/usb/phy/phy-mv-usb.c
similarity index 99%
rename from drivers/usb/phy/mv_otg.c
rename to drivers/usb/phy/phy-mv-usb.c
index b6a9be31133b0dd15231c6b02ed05cbd10adade6..6872bf0a3681cb8c18eb3a314e6feab073628714 100644 (file)
--- a/drivers/usb/phy/mv_otg.c
+++ b/drivers/usb/phy/phy-mv-usb.c
@@ -27,7 +27,7 @@
 #include <linux/usb/hcd.h>
 #include <linux/platform_data/mv_usb.h>
 
-#include "mv_otg.h"
+#include "phy-mv-usb.h"
 
 #define        DRIVER_DESC     "Marvell USB OTG transceiver driver"
 #define        DRIVER_VERSION  "Jan 20, 2010"

diff --git a/drivers/usb/phy/mv_otg.h b/drivers/usb/phy/phy-mv-usb.h
similarity index 100%
rename from drivers/usb/phy/mv_otg.h
rename to drivers/usb/phy/phy-mv-usb.h

diff --git a/drivers/usb/phy/mxs-phy.c b/drivers/usb/phy/phy-mxs-usb.c
similarity index 100%
rename from drivers/usb/phy/mxs-phy.c
rename to drivers/usb/phy/phy-mxs-usb.c

diff --git a/drivers/usb/phy/nop-usb-xceiv.c b/drivers/usb/phy/phy-nop.c
similarity index 100%
rename from drivers/usb/phy/nop-usb-xceiv.c
rename to drivers/usb/phy/phy-nop.c

diff --git a/drivers/usb/phy/omap-control-usb.c b/drivers/usb/phy/phy-omap-control.c
similarity index 100%
rename from drivers/usb/phy/omap-control-usb.c
rename to drivers/usb/phy/phy-omap-control.c

diff --git a/drivers/usb/phy/omap-usb2.c b/drivers/usb/phy/phy-omap-usb2.c
similarity index 100%
rename from drivers/usb/phy/omap-usb2.c
rename to drivers/usb/phy/phy-omap-usb2.c

diff --git a/drivers/usb/phy/omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c
similarity index 100%
rename from drivers/usb/phy/omap-usb3.c
rename to drivers/usb/phy/phy-omap-usb3.c

diff --git a/drivers/usb/phy/rcar-phy.c b/drivers/usb/phy/phy-rcar-usb.c
similarity index 100%
rename from drivers/usb/phy/rcar-phy.c
rename to drivers/usb/phy/phy-rcar-usb.c

diff --git a/drivers/usb/phy/samsung-usbphy.c b/drivers/usb/phy/phy-samsung-usb.c
similarity index 100%
rename from drivers/usb/phy/samsung-usbphy.c
rename to drivers/usb/phy/phy-samsung-usb.c

diff --git a/drivers/usb/phy/tegra_usb_phy.c b/drivers/usb/phy/phy-tegra-usb.c
similarity index 100%
rename from drivers/usb/phy/tegra_usb_phy.c
rename to drivers/usb/phy/phy-tegra-usb.c

diff --git a/drivers/usb/phy/twl4030-usb.c b/drivers/usb/phy/phy-twl4030-usb.c
similarity index 100%
rename from drivers/usb/phy/twl4030-usb.c
rename to drivers/usb/phy/phy-twl4030-usb.c

diff --git a/drivers/usb/phy/twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
similarity index 100%
rename from drivers/usb/phy/twl6030-usb.c
rename to drivers/usb/phy/phy-twl6030-usb.c

diff --git a/drivers/usb/phy/ulpi_viewport.c b/drivers/usb/phy/phy-ulpi-viewport.c
similarity index 100%
rename from drivers/usb/phy/ulpi_viewport.c
rename to drivers/usb/phy/phy-ulpi-viewport.c

diff --git a/drivers/usb/phy/ulpi.c b/drivers/usb/phy/phy-ulpi.c
similarity index 100%
rename from drivers/usb/phy/ulpi.c
rename to drivers/usb/phy/phy-ulpi.c