Hi Greg, Here's Heikki's rework on the drivers/usb/otg directory. It's actually necessary to split OTG out of transceivers because non-OTG controllers also need transceivers. Please consider merging on your usb-next branch. The following changes since commit 62aa2b537c6f5957afd98e29f96897419ed5ebab: Linux 3.3-rc2 (2012-01-31 13:31:54 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/xceiv-for-v3.4 for you to fetch changes up to 6e13c6505cdff9766d5268ffb8c972c1a2f996e6: usb: otg: Convert all users to pass struct usb_otg for OTG functions (2012-02-27 15:41:52 +0200) ---------------------------------------------------------------- Big rework to USB Transceivers support ---------------------------------------------------------------- Heikki Krogerus (19): usb: otg: Rename otg_transceiver to usb_phy usb: otg: Rename usb_xceiv_event to usb_phy_event usb: otg: Separate otg members from usb_phy usb: otg: ab8500: Start using struct usb_otg usb: otg: fsl: Start using struct usb_otg usb: otg: gpio_vbus: Start using struct usb_otg usb: otg: isp1301_omap: Start using struct usb_otg usb: otg: msm: Start using struct usb_otg usb: otg: nop: Start using struct usb_otg usb: otg: twl4030: Start using struct usb_otg usb: otg: twl6030: Start using struct usb_otg usb: otg: ulpi: Start using struct usb_otg arm: imx: Start using struct usb_otg usb: musb: Start using struct usb_otg power_supply: Convert all users to new usb_phy usb: otg: mv_otg: Start using struct usb_otg usb: Convert all users to new usb_phy usb: otg: Remove OTG specific members from usb_phy usb: otg: Convert all users to pass struct usb_otg for OTG functions arch/arm/mach-imx/mx31moboard-devboard.c | 24 +- arch/arm/mach-imx/mx31moboard-marxbot.c | 24 +- arch/arm/mach-pxa/pxa3xx-ulpi.c | 20 +- arch/arm/mach-tegra/include/mach/usb_phy.h | 2 +- arch/arm/mach-tegra/usb_phy.c | 4 +- arch/arm/plat-mxc/include/mach/mxc_ehci.h | 2 +- arch/arm/plat-mxc/include/mach/ulpi.h | 6 +- arch/arm/plat-mxc/ulpi.c | 8 +- drivers/power/isp1704_charger.c | 106 ++++---- drivers/power/pda_power.c | 10 +- drivers/power/twl4030_charger.c | 20 +- drivers/usb/gadget/ci13xxx_msm.c | 4 +- drivers/usb/gadget/ci13xxx_udc.c | 17 +- drivers/usb/gadget/ci13xxx_udc.h | 2 +- drivers/usb/gadget/fsl_udc_core.c | 9 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/langwell_udc.c | 6 +- drivers/usb/gadget/langwell_udc.h | 2 +- drivers/usb/gadget/mv_udc.h | 2 +- drivers/usb/gadget/mv_udc_core.c | 5 +- drivers/usb/gadget/omap_udc.c | 25 +- drivers/usb/gadget/omap_udc.h | 2 +- drivers/usb/gadget/pxa25x_udc.c | 13 +- drivers/usb/gadget/pxa25x_udc.h | 2 +- drivers/usb/gadget/pxa27x_udc.c | 11 +- drivers/usb/gadget/pxa27x_udc.h | 2 +- drivers/usb/gadget/s3c-hsudc.c | 13 +- drivers/usb/host/ehci-fsl.c | 6 +- drivers/usb/host/ehci-hub.c | 2 +- drivers/usb/host/ehci-msm.c | 14 +- drivers/usb/host/ehci-mv.c | 12 +- drivers/usb/host/ehci-mxc.c | 12 +- drivers/usb/host/ehci-tegra.c | 14 +- drivers/usb/host/ehci.h | 2 +- drivers/usb/host/ohci-omap.c | 8 +- drivers/usb/host/ohci.h | 2 +- drivers/usb/musb/am35x.c | 9 +- drivers/usb/musb/blackfin.c | 6 +- drivers/usb/musb/da8xx.c | 9 +- drivers/usb/musb/davinci.c | 13 +- drivers/usb/musb/musb_core.c | 24 +- drivers/usb/musb/musb_core.h | 2 +- drivers/usb/musb/musb_gadget.c | 13 +- drivers/usb/musb/musb_virthub.c | 9 +- drivers/usb/musb/omap2430.c | 35 +-- drivers/usb/musb/tusb6010.c | 22 +- drivers/usb/musb/ux500.c | 8 +- drivers/usb/otg/Kconfig | 2 +- drivers/usb/otg/ab8500-usb.c | 95 ++++--- drivers/usb/otg/fsl_otg.c | 113 ++++---- drivers/usb/otg/fsl_otg.h | 2 +- drivers/usb/otg/gpio_vbus.c | 61 +++-- drivers/usb/otg/isp1301_omap.c | 234 ++++++++-------- drivers/usb/otg/msm_otg.c | 398 ++++++++++++++-------------- drivers/usb/otg/mv_otg.c | 110 ++++---- drivers/usb/otg/mv_otg.h | 2 +- drivers/usb/otg/nop-usb-xceiv.c | 66 +++-- drivers/usb/otg/otg.c | 38 +-- drivers/usb/otg/otg_fsm.c | 22 +- drivers/usb/otg/otg_fsm.h | 2 +- drivers/usb/otg/twl4030-usb.c | 83 +++--- drivers/usb/otg/twl6030-usb.c | 119 +++++---- drivers/usb/otg/ulpi.c | 116 ++++---- drivers/usb/otg/ulpi_viewport.c | 6 +- include/linux/usb/intel_mid_otg.h | 6 +- include/linux/usb/msm_hsusb.h | 2 +- include/linux/usb/otg.h | 164 +++++++----- include/linux/usb/ulpi.h | 4 +- 68 files changed, 1186 insertions(+), 1024 deletions(-) -- balbi
Attachment:
signature.asc
Description: Digital signature