• Olof Johansson's avatar
    Merge tag 'tegra-for-3.14-dmas-resets-rework' of... · e7d248f0
    Olof Johansson authored
    Merge tag 'tegra-for-3.14-dmas-resets-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup
    
    From Stephen Warren:
    ARM: tegra: implement common DMA and resets DT bindings
    
    This series converts the Tegra DTs and drivers to use the common/
    standard DMA and reset bindings, rather than custom bindings. It also
    adds complete documentation for the Tegra clock bindings without
    actually changing any binding definitions.
    
    This conversion relies on a few sets of patches in branches from outside
    the Tegra tree:
    
    1) A patch to add an DMA channel request API which allows deferred probe
       to be implemented.
    
    2) A patch to implement a common part of the of_xlate function for DMA
       controllers.
    
    3) Some ASoC patches (which in turn rely on (1) above), which support
       deferred probe during DMA channel allocation.
    
    4) The Tegra clock driver changes for 3.14.
    
    Consequently, this branch is based on a merge of all of those external
    branches.
    
    In turn, this branch is or will be pulled into a few places that either
    rely on features introduced here, or would otherwise conflict with the
    patches:
    
    a) Tegra's own for-3.14/powergate and for-4.14/dt branches, to avoid
       conflicts.
    
    b) The DRM tree, which introduces new code that relies on the reset
       controller framework introduced in this branch, and to avoid
       conflicts.
    
    * tag 'tegra-for-3.14-dmas-resets-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (30 commits)
      spi: tegra: checking for ERR_PTR instead of NULL
      ASoC: tegra: update module reset list for Tegra124
      clk: tegra: remove bogus PCIE_XCLK
      clk: tegra: remove legacy reset APIs
      ARM: tegra: remove legacy DMA entries from DT
      ARM: tegra: remove legacy clock entries from DT
      USB: EHCI: tegra: use reset framework
      Input: tegra-kbc - use reset framework
      serial: tegra: convert to standard DMA DT bindings
      serial: tegra: use reset framework
      spi: tegra: convert to standard DMA DT bindings
      spi: tegra: use reset framework
      staging: nvec: use reset framework
      i2c: tegra: use reset framework
      ASoC: tegra: convert to standard DMA DT bindings
      ASoC: tegra: allocate AHUB FIFO during probe() not startup()
      ASoC: tegra: call pm_runtime APIs around register accesses
      ASoC: tegra: use reset framework
      dma: tegra: register as an OF DMA controller
      dma: tegra: use reset framework
      ...
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    e7d248f0
drm.h 7.07 KB