Hi Greg,
and finally, here's the musb pull request for v3.7 merge window.
This is bigger than I was initially expecting and the entire DeviceTree
migration seems to be delaying a few things, that's why this pull
request took a few more hours to prepare then the others.
I don't expect any problems with any of these patches since they are
both self-contained to drivers/usb/musb/ and have been pending for
a long time on the mailing list.
Please, _do_ let me know if you run into any issues. There will be a
conflict here, but I have pushed the resolution to
merge-result-for-greg.
The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/musb-for-v3.7
for you to fetch changes up to d8c3ef256f88b7c6ecd673d03073b5645be9c5e4:
usb: musb: dsps: remove explicit NOP device creation (2012-09-11 17:36:50 +0300)
----------------------------------------------------------------
usb: musb: patches for v3.7 merge window
Here we have a bunch of miscellaneous cleanups and fixes
to the musb driver. It fixes a bunch of mistakes errors
which nobody has triggered before, so I'm not Ccing stable
tree.
We are finally improving OMAP's VBUS/ID Mailbox usage so
that we can introduce our PHY drivers properly. Also, we're
adding support for multiple instances of the MUSB IP in
the same SoC, as seen on some platforms from TI which
have 2 MUSB instances.
Other than that, we have some small fixes like not kicking
DMA for a zero byte transfer, or properly handling NAK timeout
on MUSB's host side, and the enabling of DMA Mode1 for any
transfers which are aligned to wMaxPacketSize.
All patches have been pending on mailing list for a long time
and I don't expect any big surprises with this pull request.
----------------------------------------------------------------
Ajay Kumar Gupta (7):
usb: musb: host: don't program dma for zero byte tx
usb: musb: gadget: don't program dma for zero byte tx
usb: musb: check for zero byte in musb_read/write_fifo
usb: musb: NAK timeout scheme on bulk TX endpoint
usb: musb: kill global and static for multi instance
usb: musb: dsps: add dt support
usb: musb: dsps: remove explicit NOP device creation
B, Ravi (2):
usb: musb: add musb_ida for multi instance support
usb: musb: am335x: add support for dual instance
Brian Downing (1):
usb: musb: Fix bad call to kfree() in musb_free
Felipe Balbi (3):
usb: musb: fix sparse warnings
usb: musb: drop useless board_mode usage
usb: musb: drop is_host_capable() and is_peripheral_capable()
Kishon Vijay Abraham I (4):
usb: musb: cleanup while removing musb omap glue driver
arm: omap: hwmod: add a new addr space in otg for writing to control module
usb: musb: omap: write directly to mailbox instead of using phy
usb: musb: omap: Add device tree support for omap musb glue
Matthias Brugger (1):
usb: musb: omap2430.c delete unused variable.
NeilBrown (1):
usb: musb: omap2430: don't loop indefinitely in interrupt.
Peter Meerwald (1):
usb: musb: fix spelling of families in Kconfig
Roger Quadros (2):
usb: musb: use DMA mode 1 whenever possible
usb: musb: Remove redundant if statement
Sergei Shtylyov (2):
usb: musb: gadget: use variables according to their names in rxstate()
usb: musb: core: fix kernel-doc of musb_init_controller()
Shubhrajyoti D (2):
usb: musb: Prevent the masking of the return value
usb: musb: Make dma_controller_create __devinit
Virupax Sadashivpetimath (1):
usb: musb: host: Handle highmem in PIO mode
.../devicetree/bindings/usb/am33xx-usb.txt | 14 +
Documentation/devicetree/bindings/usb/omap-usb.txt | 33 ++
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 +
drivers/usb/musb/Kconfig | 2 +-
drivers/usb/musb/am35x.c | 66 ++--
drivers/usb/musb/blackfin.c | 63 ++--
drivers/usb/musb/cppi_dma.c | 2 +-
drivers/usb/musb/da8xx.c | 58 ++--
drivers/usb/musb/davinci.c | 66 ++--
drivers/usb/musb/musb_core.c | 331 +++++++++------------
drivers/usb/musb/musb_core.h | 17 +-
drivers/usb/musb/musb_debugfs.c | 8 +-
drivers/usb/musb/musb_dma.h | 2 +-
drivers/usb/musb/musb_dsps.c | 189 ++++++++----
drivers/usb/musb/musb_gadget.c | 172 ++++-------
drivers/usb/musb/musb_host.c | 264 +++++++++++-----
drivers/usb/musb/musb_host.h | 3 +
drivers/usb/musb/musb_virthub.c | 13 +-
drivers/usb/musb/musbhsdma.c | 2 +-
drivers/usb/musb/omap2430.c | 156 ++++++++--
drivers/usb/musb/omap2430.h | 9 +
drivers/usb/musb/tusb6010.c | 56 ++--
drivers/usb/musb/tusb6010_omap.c | 2 +-
drivers/usb/musb/ux500.c | 33 +-
drivers/usb/musb/ux500_dma.c | 2 +-
25 files changed, 919 insertions(+), 650 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/am33xx-usb.txt
create mode 100644 Documentation/devicetree/bindings/usb/omap-usb.txt
--
balbi
Attachment:
signature.asc
Description: Digital signature
