From 94ae98433a397dd4695652fc62ca7bc784b08216 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Thu, 7 Mar 2013 17:37:59 +0200
Subject: [PATCH] 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>
---
 drivers/usb/phy/Makefile                      | 42 +++++++++----------
 .../phy/{ab8500-usb.c => phy-ab8500-usb.c}    |  0
 drivers/usb/phy/{fsl_otg.c => phy-fsl-usb.c}  |  2 +-
 drivers/usb/phy/{fsl_otg.h => phy-fsl-usb.h}  |  0
 drivers/usb/phy/{otg_fsm.c => phy-fsm-usb.c}  |  2 +-
 drivers/usb/phy/{otg_fsm.h => phy-fsm-usb.h}  |  0
 .../phy/{gpio_vbus.c => phy-gpio-vbus-usb.c}  |  0
 .../{isp1301_omap.c => phy-isp1301-omap.c}    |  0
 drivers/usb/phy/{isp1301.c => phy-isp1301.c}  |  0
 drivers/usb/phy/{msm_otg.c => phy-msm-usb.c}  |  0
 .../phy/{mv_u3d_phy.c => phy-mv-u3d-usb.c}    |  2 +-
 .../phy/{mv_u3d_phy.h => phy-mv-u3d-usb.h}    |  0
 drivers/usb/phy/{mv_otg.c => phy-mv-usb.c}    |  2 +-
 drivers/usb/phy/{mv_otg.h => phy-mv-usb.h}    |  0
 drivers/usb/phy/{mxs-phy.c => phy-mxs-usb.c}  |  0
 .../usb/phy/{nop-usb-xceiv.c => phy-nop.c}    |  0
 ...{omap-control-usb.c => phy-omap-control.c} |  0
 .../usb/phy/{omap-usb2.c => phy-omap-usb2.c}  |  0
 .../usb/phy/{omap-usb3.c => phy-omap-usb3.c}  |  0
 .../usb/phy/{rcar-phy.c => phy-rcar-usb.c}    |  0
 .../{samsung-usbphy.c => phy-samsung-usb.c}   |  0
 .../phy/{tegra_usb_phy.c => phy-tegra-usb.c}  |  0
 .../phy/{twl4030-usb.c => phy-twl4030-usb.c}  |  0
 .../phy/{twl6030-usb.c => phy-twl6030-usb.c}  |  0
 .../{ulpi_viewport.c => phy-ulpi-viewport.c}  |  0
 drivers/usb/phy/{ulpi.c => phy-ulpi.c}        |  0
 26 files changed, 25 insertions(+), 25 deletions(-)
 rename drivers/usb/phy/{ab8500-usb.c => phy-ab8500-usb.c} (100%)
 rename drivers/usb/phy/{fsl_otg.c => phy-fsl-usb.c} (99%)
 rename drivers/usb/phy/{fsl_otg.h => phy-fsl-usb.h} (100%)
 rename drivers/usb/phy/{otg_fsm.c => phy-fsm-usb.c} (99%)
 rename drivers/usb/phy/{otg_fsm.h => phy-fsm-usb.h} (100%)
 rename drivers/usb/phy/{gpio_vbus.c => phy-gpio-vbus-usb.c} (100%)
 rename drivers/usb/phy/{isp1301_omap.c => phy-isp1301-omap.c} (100%)
 rename drivers/usb/phy/{isp1301.c => phy-isp1301.c} (100%)
 rename drivers/usb/phy/{msm_otg.c => phy-msm-usb.c} (100%)
 rename drivers/usb/phy/{mv_u3d_phy.c => phy-mv-u3d-usb.c} (99%)
 rename drivers/usb/phy/{mv_u3d_phy.h => phy-mv-u3d-usb.h} (100%)
 rename drivers/usb/phy/{mv_otg.c => phy-mv-usb.c} (99%)
 rename drivers/usb/phy/{mv_otg.h => phy-mv-usb.h} (100%)
 rename drivers/usb/phy/{mxs-phy.c => phy-mxs-usb.c} (100%)
 rename drivers/usb/phy/{nop-usb-xceiv.c => phy-nop.c} (100%)
 rename drivers/usb/phy/{omap-control-usb.c => phy-omap-control.c} (100%)
 rename drivers/usb/phy/{omap-usb2.c => phy-omap-usb2.c} (100%)
 rename drivers/usb/phy/{omap-usb3.c => phy-omap-usb3.c} (100%)
 rename drivers/usb/phy/{rcar-phy.c => phy-rcar-usb.c} (100%)
 rename drivers/usb/phy/{samsung-usbphy.c => phy-samsung-usb.c} (100%)
 rename drivers/usb/phy/{tegra_usb_phy.c => phy-tegra-usb.c} (100%)
 rename drivers/usb/phy/{twl4030-usb.c => phy-twl4030-usb.c} (100%)
 rename drivers/usb/phy/{twl6030-usb.c => phy-twl6030-usb.c} (100%)
 rename drivers/usb/phy/{ulpi_viewport.c => phy-ulpi-viewport.c} (100%)
 rename drivers/usb/phy/{ulpi.c => phy-ulpi.c} (100%)

diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index d10a8b387ff..5fb4a5d5594 100644
--- 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 72a2a00c248..97b9308507c 100644
--- 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 1f729a15dec..c520b3548e7 100644
--- 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 9d8599122aa..cb7e70f1770 100644
--- 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 b6a9be31133..6872bf0a368 100644
--- 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
-- 
2.46.0