1. 01 Mar, 2012 4 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'gadget-for-v3.4' of... · f9b0f517
      Greg Kroah-Hartman authored
      Merge tag 'gadget-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
      
      USB: Gadget: changes for 3.4
      
      This merge is rather big. Here's what it contains:
      
      For am5536udc we have just simple coding style fixes. Nothing that has any
      potential to cause any issues going forward.
      
      With mv_udc, there's only one single change removing an unneeded NULL check.
      
      at91_udc also only saw a single change this merge window, and that's only
      removing a duplicated header.
      
      The Renesas controller has a few more involved changes. Support for SUDMAC was
      added, there's now a special handling of IRQ resources for when the IRQ line is
      shared between Renesas controller and SUDMAC, we also had a bug fix where
      Renesas controller would sleep in atomic context while doing DMA transfers from
      a tasklet. There were also a set of minor cleanups.
      
      The FSL UDC also had a scheduling in atomic context bug fix, but that's all.
      
      Thanks to Sebastian, the dummy_hcd now works better than ever with support for
      scatterlists and streams. Sebastian also added SuperSpeed descriptors to the
      serial gadgets.
      
      The highlight on this merge is the addition of a generic API for mapping and
      unmapping usb_requests. This will avoid code duplication on all UDC controllers
      and also kills all the defines for DMA_ADDR_INVALID which UDC controllers
      sprinkled around. A few of the UDC controllers were already converted to use
      this new API.
      
      Conflicts:
      	drivers/usb/dwc3/gadget.c
      f9b0f517
    • Greg Kroah-Hartman's avatar
      Merge tag 'xceiv-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next · 8062d94a
      Greg Kroah-Hartman authored
      USB: transceiver changes for 3.4
      
      Here we have a big rework done by Heikki Krogerus (thanks) which
      splits OTG functionality away from transceivers.
      
      We have known for quite a long time that struct otg_transceiver was
      a bad name for the structure, considering transceiver is far from
      being OTG-specific (see 4e67185a).
      8062d94a
    • Greg Kroah-Hartman's avatar
      Merge tag 'musb-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next · 15e68a80
      Greg Kroah-Hartman authored
      USB: MUSB changes for 3.4
      
      Here are a set of changes to the MUSB driver. In summary we have
      a patch making modules behave better, there's a fix on debugfs'
      error path, a small change removing an unnecessary pm_runtime
      call on musb_shutdown() and a fix to relesect the endpoint in
      Interrupt context.
      
      This last patch is needed because we must drop musb's lock when
      calling request->complete() and that could cause problems if another
      thread queues a request and ends up changing MUSB_INDEX register.
      15e68a80
    • Greg Kroah-Hartman's avatar
      Revert "powerpc/usb: fix usb CTRL_PHY_CLK_VALID breaks on some platform" · f7c96f59
      Greg Kroah-Hartman authored
      This reverts commit 79857e8e.
      
      To quote Shengzhou Liu:
      	I'm sorry, please don't apply this patch.
      	It appears not only on P1022 platform.
      	There will be more breaks on other platforms regarding
      	CTRL_PHY_CLK_VALID bit.
      	I will post a new patch with well compatibility on all
      	platforms as soon as I get necessary confirmations.
      
      Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      f7c96f59
  2. 28 Feb, 2012 36 commits