---

yaml --- r: 364703 b: refs/heads/master c: 94ae984 h: refs/heads/master i: 364701: f4b7062 364699: 08de293 364695: 5ed6b3e 364687: b0b14a0 364671: fca8e84 v: v3
git-mirror · Mar 18, 2013 · cd0b2b1 · cd0b2b1
1 parent 04100e8
commit cd0b2b1
Show file tree

Hide file tree

Showing 27 changed files with 26 additions and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd891498751f53dda3733d9e9ff8a1f6ea16c5e5
+refs/heads/master: 94ae98433a397dd4695652fc62ca7bc784b08216
diff --git a/trunk/drivers/usb/phy/Makefile b/trunk/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/trunk/drivers/usb/phy/ab8500-usb.c → trunk/drivers/usb/phy/phy-ab8500-usb.c b/trunk/drivers/usb/phy/ab8500-usb.c → trunk/drivers/usb/phy/phy-ab8500-usb.c
diff --git a/trunk/drivers/usb/phy/fsl_otg.c → trunk/drivers/usb/phy/phy-fsl-usb.c b/trunk/drivers/usb/phy/fsl_otg.c → trunk/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/trunk/drivers/usb/phy/fsl_otg.h → trunk/drivers/usb/phy/phy-fsl-usb.h b/trunk/drivers/usb/phy/fsl_otg.h → trunk/drivers/usb/phy/phy-fsl-usb.h
diff --git a/trunk/drivers/usb/phy/otg_fsm.c → trunk/drivers/usb/phy/phy-fsm-usb.c b/trunk/drivers/usb/phy/otg_fsm.c → trunk/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/trunk/drivers/usb/phy/otg_fsm.h → trunk/drivers/usb/phy/phy-fsm-usb.h b/trunk/drivers/usb/phy/otg_fsm.h → trunk/drivers/usb/phy/phy-fsm-usb.h
diff --git a/trunk/drivers/usb/phy/gpio_vbus.c → trunk/drivers/usb/phy/phy-gpio-vbus-usb.c b/trunk/drivers/usb/phy/gpio_vbus.c → trunk/drivers/usb/phy/phy-gpio-vbus-usb.c
diff --git a/trunk/drivers/usb/phy/isp1301_omap.c → trunk/drivers/usb/phy/phy-isp1301-omap.c b/trunk/drivers/usb/phy/isp1301_omap.c → trunk/drivers/usb/phy/phy-isp1301-omap.c
diff --git a/trunk/drivers/usb/phy/isp1301.c → trunk/drivers/usb/phy/phy-isp1301.c b/trunk/drivers/usb/phy/isp1301.c → trunk/drivers/usb/phy/phy-isp1301.c
diff --git a/trunk/drivers/usb/phy/msm_otg.c → trunk/drivers/usb/phy/phy-msm-usb.c b/trunk/drivers/usb/phy/msm_otg.c → trunk/drivers/usb/phy/phy-msm-usb.c
diff --git a/trunk/drivers/usb/phy/mv_u3d_phy.c → trunk/drivers/usb/phy/phy-mv-u3d-usb.c b/trunk/drivers/usb/phy/mv_u3d_phy.c → trunk/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/trunk/drivers/usb/phy/mv_u3d_phy.h → trunk/drivers/usb/phy/phy-mv-u3d-usb.h b/trunk/drivers/usb/phy/mv_u3d_phy.h → trunk/drivers/usb/phy/phy-mv-u3d-usb.h
diff --git a/trunk/drivers/usb/phy/mv_otg.c → trunk/drivers/usb/phy/phy-mv-usb.c b/trunk/drivers/usb/phy/mv_otg.c → trunk/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/trunk/drivers/usb/phy/mv_otg.h → trunk/drivers/usb/phy/phy-mv-usb.h b/trunk/drivers/usb/phy/mv_otg.h → trunk/drivers/usb/phy/phy-mv-usb.h
diff --git a/trunk/drivers/usb/phy/mxs-phy.c → trunk/drivers/usb/phy/phy-mxs-usb.c b/trunk/drivers/usb/phy/mxs-phy.c → trunk/drivers/usb/phy/phy-mxs-usb.c
diff --git a/trunk/drivers/usb/phy/nop-usb-xceiv.c → trunk/drivers/usb/phy/phy-nop.c b/trunk/drivers/usb/phy/nop-usb-xceiv.c → trunk/drivers/usb/phy/phy-nop.c
diff --git a/trunk/drivers/usb/phy/omap-control-usb.c → trunk/drivers/usb/phy/phy-omap-control.c b/trunk/drivers/usb/phy/omap-control-usb.c → trunk/drivers/usb/phy/phy-omap-control.c
diff --git a/trunk/drivers/usb/phy/omap-usb2.c → trunk/drivers/usb/phy/phy-omap-usb2.c b/trunk/drivers/usb/phy/omap-usb2.c → trunk/drivers/usb/phy/phy-omap-usb2.c
diff --git a/trunk/drivers/usb/phy/omap-usb3.c → trunk/drivers/usb/phy/phy-omap-usb3.c b/trunk/drivers/usb/phy/omap-usb3.c → trunk/drivers/usb/phy/phy-omap-usb3.c
diff --git a/trunk/drivers/usb/phy/rcar-phy.c → trunk/drivers/usb/phy/phy-rcar-usb.c b/trunk/drivers/usb/phy/rcar-phy.c → trunk/drivers/usb/phy/phy-rcar-usb.c
diff --git a/trunk/drivers/usb/phy/samsung-usbphy.c → trunk/drivers/usb/phy/phy-samsung-usb.c b/trunk/drivers/usb/phy/samsung-usbphy.c → trunk/drivers/usb/phy/phy-samsung-usb.c
diff --git a/trunk/drivers/usb/phy/tegra_usb_phy.c → trunk/drivers/usb/phy/phy-tegra-usb.c b/trunk/drivers/usb/phy/tegra_usb_phy.c → trunk/drivers/usb/phy/phy-tegra-usb.c
diff --git a/trunk/drivers/usb/phy/twl4030-usb.c → trunk/drivers/usb/phy/phy-twl4030-usb.c b/trunk/drivers/usb/phy/twl4030-usb.c → trunk/drivers/usb/phy/phy-twl4030-usb.c
diff --git a/trunk/drivers/usb/phy/twl6030-usb.c → trunk/drivers/usb/phy/phy-twl6030-usb.c b/trunk/drivers/usb/phy/twl6030-usb.c → trunk/drivers/usb/phy/phy-twl6030-usb.c
diff --git a/trunk/drivers/usb/phy/ulpi_viewport.c → trunk/drivers/usb/phy/phy-ulpi-viewport.c b/trunk/drivers/usb/phy/ulpi_viewport.c → trunk/drivers/usb/phy/phy-ulpi-viewport.c
diff --git a/trunk/drivers/usb/phy/ulpi.c → trunk/drivers/usb/phy/phy-ulpi.c b/trunk/drivers/usb/phy/ulpi.c → trunk/drivers/usb/phy/phy-ulpi.c