Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+25 -25
+21 -21
drivers/usb/phy/Makefile
··· 8 8 9 9 # transceiver drivers, keep the list sorted 10 10 11 - obj-$(CONFIG_AB8500_USB) += ab8500-usb.o 12 - fsl_usb2_otg-objs := fsl_otg.o otg_fsm.o 13 - obj-$(CONFIG_FSL_USB2_OTG) += fsl_usb2_otg.o 14 - obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o 15 - obj-$(CONFIG_MV_U3D_PHY) += mv_u3d_phy.o 16 - obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o 17 - obj-$(CONFIG_OMAP_CONTROL_USB) += omap-control-usb.o 18 - obj-$(CONFIG_OMAP_USB2) += omap-usb2.o 19 - obj-$(CONFIG_OMAP_USB3) += omap-usb3.o 20 - obj-$(CONFIG_SAMSUNG_USBPHY) += samsung-usbphy.o 21 - obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o 22 - obj-$(CONFIG_TWL6030_USB) += twl6030-usb.o 23 - obj-$(CONFIG_USB_EHCI_TEGRA) += tegra_usb_phy.o 24 - obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o 25 - obj-$(CONFIG_USB_ISP1301) += isp1301.o 26 - obj-$(CONFIG_USB_MSM_OTG) += msm_otg.o 27 - obj-$(CONFIG_USB_MV_OTG) += mv_otg.o 28 - obj-$(CONFIG_USB_MXS_PHY) += mxs-phy.o 29 - obj-$(CONFIG_USB_RCAR_PHY) += rcar-phy.o 30 - obj-$(CONFIG_USB_ULPI) += ulpi.o 31 - obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o 11 + obj-$(CONFIG_AB8500_USB) += phy-ab8500-usb.o 12 + phy-fsl-usb2-objs := phy-fsl-usb.o phy-fsm-usb.o 13 + obj-$(CONFIG_FSL_USB2_OTG) += phy-fsl-usb2.o 14 + obj-$(CONFIG_ISP1301_OMAP) += phy-isp1301.omap.o 15 + obj-$(CONFIG_MV_U3D_PHY) += phy-mv-u3d-usb.o 16 + obj-$(CONFIG_NOP_USB_XCEIV) += phy-nop.o 17 + obj-$(CONFIG_OMAP_CONTROL_USB) += phy-omap-control.o 18 + obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o 19 + obj-$(CONFIG_OMAP_USB3) += phy-omap-usb3.o 20 + obj-$(CONFIG_SAMSUNG_USBPHY) += phy-samsung-usb.o 21 + obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o 22 + obj-$(CONFIG_TWL6030_USB) += phy-twl6030-usb.o 23 + obj-$(CONFIG_USB_EHCI_TEGRA) += phy-tegra-usb.o 24 + obj-$(CONFIG_USB_GPIO_VBUS) += phy-gpio-vbus-usb.o 25 + obj-$(CONFIG_USB_ISP1301) += phy-isp1301.o 26 + obj-$(CONFIG_USB_MSM_OTG) += phy-msm-usb.o 27 + obj-$(CONFIG_USB_MV_OTG) += phy-mv-usb.o 28 + obj-$(CONFIG_USB_MXS_PHY) += phy-mxs-usb.o 29 + obj-$(CONFIG_USB_RCAR_PHY) += phy-rcar-usb.o 30 + obj-$(CONFIG_USB_ULPI) += phy-ulpi.o 31 + obj-$(CONFIG_USB_ULPI_VIEWPORT) += phy-ulpi-viewport.o
drivers/usb/phy/ab8500-usb.c drivers/usb/phy/phy-ab8500-usb.c
+1 -1
drivers/usb/phy/fsl_otg.c drivers/usb/phy/phy-fsl-usb.c
··· 43 43 44 44 #include <asm/unaligned.h> 45 45 46 - #include "fsl_otg.h" 46 + #include "phy-fsl-usb.h" 47 47 48 48 #define DRIVER_VERSION "Rev. 1.55" 49 49 #define DRIVER_AUTHOR "Jerry Huang/Li Yang"
drivers/usb/phy/fsl_otg.h drivers/usb/phy/phy-fsl-usb.h
drivers/usb/phy/gpio_vbus.c drivers/usb/phy/phy-gpio-vbus-usb.c
drivers/usb/phy/isp1301.c drivers/usb/phy/phy-isp1301.c
drivers/usb/phy/isp1301_omap.c drivers/usb/phy/phy-isp1301-omap.c
drivers/usb/phy/msm_otg.c drivers/usb/phy/phy-msm-usb.c
+1 -1
drivers/usb/phy/mv_otg.c drivers/usb/phy/phy-mv-usb.c
··· 27 27 #include <linux/usb/hcd.h> 28 28 #include <linux/platform_data/mv_usb.h> 29 29 30 - #include "mv_otg.h" 30 + #include "phy-mv-usb.h" 31 31 32 32 #define DRIVER_DESC "Marvell USB OTG transceiver driver" 33 33 #define DRIVER_VERSION "Jan 20, 2010"
drivers/usb/phy/mv_otg.h drivers/usb/phy/phy-mv-usb.h
+1 -1
drivers/usb/phy/mv_u3d_phy.c drivers/usb/phy/phy-mv-u3d-usb.c
··· 15 15 #include <linux/usb/otg.h> 16 16 #include <linux/platform_data/mv_usb.h> 17 17 18 - #include "mv_u3d_phy.h" 18 + #include "phy-mv-u3d-usb.h" 19 19 20 20 /* 21 21 * struct mv_u3d_phy - transceiver driver state
drivers/usb/phy/mv_u3d_phy.h drivers/usb/phy/phy-mv-u3d-usb.h
drivers/usb/phy/mxs-phy.c drivers/usb/phy/phy-mxs-usb.c
drivers/usb/phy/nop-usb-xceiv.c drivers/usb/phy/phy-nop.c
drivers/usb/phy/omap-control-usb.c drivers/usb/phy/phy-omap-control.c
drivers/usb/phy/omap-usb2.c drivers/usb/phy/phy-omap-usb2.c
drivers/usb/phy/omap-usb3.c drivers/usb/phy/phy-omap-usb3.c
+1 -1
drivers/usb/phy/otg_fsm.c drivers/usb/phy/phy-fsm-usb.c
··· 29 29 #include <linux/usb/gadget.h> 30 30 #include <linux/usb/otg.h> 31 31 32 - #include "otg_fsm.h" 32 + #include "phy-otg-fsm.h" 33 33 34 34 /* Change USB protocol when there is a protocol change */ 35 35 static int otg_set_protocol(struct otg_fsm *fsm, int protocol)
drivers/usb/phy/otg_fsm.h drivers/usb/phy/phy-fsm-usb.h
drivers/usb/phy/rcar-phy.c drivers/usb/phy/phy-rcar-usb.c
drivers/usb/phy/samsung-usbphy.c drivers/usb/phy/phy-samsung-usb.c
drivers/usb/phy/tegra_usb_phy.c drivers/usb/phy/phy-tegra-usb.c
drivers/usb/phy/twl4030-usb.c drivers/usb/phy/phy-twl4030-usb.c
drivers/usb/phy/twl6030-usb.c drivers/usb/phy/phy-twl6030-usb.c
drivers/usb/phy/ulpi.c drivers/usb/phy/phy-ulpi.c
drivers/usb/phy/ulpi_viewport.c drivers/usb/phy/phy-ulpi-viewport.c