Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2

2026-10-16 22:39:48 +00:00 · 2012-09-14 11:35:16 -06:00 · 2012-09-14 11:35:16 -06:00 · fef40b2369
commit fef40b2369
parent f49540d1d7 363366cf61
43 changed files with 2423 additions and 1434 deletions
--- a/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
+++ b/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
--- a/Documentation/devicetree/bindings/usb/usb-phy.txt
+++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
--- a/drivers/usb/otg/fsl_otg.c
+++ b/drivers/usb/otg/fsl_otg.c
--- a/drivers/usb/otg/mxs-phy.c
+++ b/drivers/usb/otg/mxs-phy.c
--- a/drivers/usb/otg/nop-usb-xceiv.c
+++ b/drivers/usb/otg/nop-usb-xceiv.c
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
--- a/drivers/usb/phy/isp1301.c
+++ b/drivers/usb/phy/isp1301.c
--- a/drivers/usb/phy/mv_u3d_phy.c
+++ b/drivers/usb/phy/mv_u3d_phy.c
--- a/drivers/usb/phy/mv_u3d_phy.h
+++ b/drivers/usb/phy/mv_u3d_phy.h
--- a/drivers/usb/phy/omap-usb2.c
+++ b/drivers/usb/phy/omap-usb2.c
--- a/drivers/usb/phy/tegra_usb_phy.c
+++ b/drivers/usb/phy/tegra_usb_phy.c
--- a/include/linux/usb/nop-usb-xceiv.h
+++ b/include/linux/usb/nop-usb-xceiv.h
--- a/include/linux/usb/omap_usb.h
+++ b/include/linux/usb/omap_usb.h
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
--- a/include/linux/usb/phy_companion.h
+++ b/include/linux/usb/phy_companion.h
--- a/arch/arm/mach-tegra/include/mach/usb_phy.h
+++ b/arch/arm/mach-tegra/include/mach/usb_phy.h