summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/usb/phy/Makefile42
-rw-r--r--drivers/usb/phy/phy-ab8500-usb.c (renamed from drivers/usb/phy/ab8500-usb.c)0
-rw-r--r--drivers/usb/phy/phy-fsl-usb.c (renamed from drivers/usb/phy/fsl_otg.c)2
-rw-r--r--drivers/usb/phy/phy-fsl-usb.h (renamed from drivers/usb/phy/fsl_otg.h)0
-rw-r--r--drivers/usb/phy/phy-fsm-usb.c (renamed from drivers/usb/phy/otg_fsm.c)2
-rw-r--r--drivers/usb/phy/phy-fsm-usb.h (renamed from drivers/usb/phy/otg_fsm.h)0
-rw-r--r--drivers/usb/phy/phy-gpio-vbus-usb.c (renamed from drivers/usb/phy/gpio_vbus.c)0
-rw-r--r--drivers/usb/phy/phy-isp1301-omap.c (renamed from drivers/usb/phy/isp1301_omap.c)0
-rw-r--r--drivers/usb/phy/phy-isp1301.c (renamed from drivers/usb/phy/isp1301.c)0
-rw-r--r--drivers/usb/phy/phy-msm-usb.c (renamed from drivers/usb/phy/msm_otg.c)0
-rw-r--r--drivers/usb/phy/phy-mv-u3d-usb.c (renamed from drivers/usb/phy/mv_u3d_phy.c)2
-rw-r--r--drivers/usb/phy/phy-mv-u3d-usb.h (renamed from drivers/usb/phy/mv_u3d_phy.h)0
-rw-r--r--drivers/usb/phy/phy-mv-usb.c (renamed from drivers/usb/phy/mv_otg.c)2
-rw-r--r--drivers/usb/phy/phy-mv-usb.h (renamed from drivers/usb/phy/mv_otg.h)0
-rw-r--r--drivers/usb/phy/phy-mxs-usb.c (renamed from drivers/usb/phy/mxs-phy.c)0
-rw-r--r--drivers/usb/phy/phy-nop.c (renamed from drivers/usb/phy/nop-usb-xceiv.c)0
-rw-r--r--drivers/usb/phy/phy-omap-control.c (renamed from drivers/usb/phy/omap-control-usb.c)0
-rw-r--r--drivers/usb/phy/phy-omap-usb2.c (renamed from drivers/usb/phy/omap-usb2.c)0
-rw-r--r--drivers/usb/phy/phy-omap-usb3.c (renamed from drivers/usb/phy/omap-usb3.c)0
-rw-r--r--drivers/usb/phy/phy-rcar-usb.c (renamed from drivers/usb/phy/rcar-phy.c)0
-rw-r--r--drivers/usb/phy/phy-samsung-usb.c (renamed from drivers/usb/phy/samsung-usbphy.c)0
-rw-r--r--drivers/usb/phy/phy-tegra-usb.c (renamed from drivers/usb/phy/tegra_usb_phy.c)0
-rw-r--r--drivers/usb/phy/phy-twl4030-usb.c (renamed from drivers/usb/phy/twl4030-usb.c)0
-rw-r--r--drivers/usb/phy/phy-twl6030-usb.c (renamed from drivers/usb/phy/twl6030-usb.c)0
-rw-r--r--drivers/usb/phy/phy-ulpi-viewport.c (renamed from drivers/usb/phy/ulpi_viewport.c)0
-rw-r--r--drivers/usb/phy/phy-ulpi.c (renamed from drivers/usb/phy/ulpi.c)0
26 files changed, 25 insertions, 25 deletions
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index d10a8b3..5fb4a5d 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
index 2d86f26..2d86f26 100644
--- a/drivers/usb/phy/ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
diff --git a/drivers/usb/phy/fsl_otg.c b/drivers/usb/phy/phy-fsl-usb.c
index 72a2a00..97b9308 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
index ca26628..ca26628 100644
--- a/drivers/usb/phy/fsl_otg.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
diff --git a/drivers/usb/phy/otg_fsm.c b/drivers/usb/phy/phy-fsm-usb.c
index 1f729a1..c520b35 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
index c30a2e1..c30a2e1 100644
--- a/drivers/usb/phy/otg_fsm.h
+++ b/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
index a7d4ac5..a7d4ac5 100644
--- a/drivers/usb/phy/gpio_vbus.c
+++ b/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
index 8fe0c3b..8fe0c3b 100644
--- a/drivers/usb/phy/isp1301_omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
diff --git a/drivers/usb/phy/isp1301.c b/drivers/usb/phy/phy-isp1301.c
index 18dbf7e..18dbf7e 100644
--- a/drivers/usb/phy/isp1301.c
+++ b/drivers/usb/phy/phy-isp1301.c
diff --git a/drivers/usb/phy/msm_otg.c b/drivers/usb/phy/phy-msm-usb.c
index 749fbf4..749fbf4 100644
--- a/drivers/usb/phy/msm_otg.c
+++ b/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
index 9d85991..cb7e70f 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
index 2a658cb..2a658cb 100644
--- a/drivers/usb/phy/mv_u3d_phy.h
+++ b/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
index b6a9be3..6872bf0 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
index 8a9e351..8a9e351 100644
--- a/drivers/usb/phy/mv_otg.h
+++ b/drivers/usb/phy/phy-mv-usb.h
diff --git a/drivers/usb/phy/mxs-phy.c b/drivers/usb/phy/phy-mxs-usb.c
index 9d4381e..9d4381e 100644
--- a/drivers/usb/phy/mxs-phy.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
diff --git a/drivers/usb/phy/nop-usb-xceiv.c b/drivers/usb/phy/phy-nop.c
index 2b10cc9..2b10cc9 100644
--- a/drivers/usb/phy/nop-usb-xceiv.c
+++ b/drivers/usb/phy/phy-nop.c
diff --git a/drivers/usb/phy/omap-control-usb.c b/drivers/usb/phy/phy-omap-control.c
index 1419ced..1419ced 100644
--- a/drivers/usb/phy/omap-control-usb.c
+++ b/drivers/usb/phy/phy-omap-control.c
diff --git a/drivers/usb/phy/omap-usb2.c b/drivers/usb/phy/phy-omap-usb2.c
index 844ab68..844ab68 100644
--- a/drivers/usb/phy/omap-usb2.c
+++ b/drivers/usb/phy/phy-omap-usb2.c
diff --git a/drivers/usb/phy/omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c
index a6e60b1..a6e60b1 100644
--- a/drivers/usb/phy/omap-usb3.c
+++ b/drivers/usb/phy/phy-omap-usb3.c
diff --git a/drivers/usb/phy/rcar-phy.c b/drivers/usb/phy/phy-rcar-usb.c
index a35681b..a35681b 100644
--- a/drivers/usb/phy/rcar-phy.c
+++ b/drivers/usb/phy/phy-rcar-usb.c
diff --git a/drivers/usb/phy/samsung-usbphy.c b/drivers/usb/phy/phy-samsung-usb.c
index 967101e..967101e 100644
--- a/drivers/usb/phy/samsung-usbphy.c
+++ b/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
index 5487d38..5487d38 100644
--- a/drivers/usb/phy/tegra_usb_phy.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
diff --git a/drivers/usb/phy/twl4030-usb.c b/drivers/usb/phy/phy-twl4030-usb.c
index a994715..a994715 100644
--- a/drivers/usb/phy/twl4030-usb.c
+++ b/drivers/usb/phy/phy-twl4030-usb.c
diff --git a/drivers/usb/phy/twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index 8cd6cf4..8cd6cf4 100644
--- a/drivers/usb/phy/twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
diff --git a/drivers/usb/phy/ulpi_viewport.c b/drivers/usb/phy/phy-ulpi-viewport.c
index c5ba7e5..c5ba7e5 100644
--- a/drivers/usb/phy/ulpi_viewport.c
+++ b/drivers/usb/phy/phy-ulpi-viewport.c
diff --git a/drivers/usb/phy/ulpi.c b/drivers/usb/phy/phy-ulpi.c
index 217339d..217339d 100644
--- a/drivers/usb/phy/ulpi.c
+++ b/drivers/usb/phy/phy-ulpi.c
generated by cgit v0.10.2 at 2024-11-01 17:23:52 (GMT)