Commit de63452c authored by Suman Anna's avatar Suman Anna
Browse files

Merge branch 'platform-ti-linux-4.1.y' of...

Merge branch 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into iommu-linux-4.1.y

Pull in the latest platform base code into the IOMMU feature tree.
The resync merge pulls in the necessary board support for AM57xx
IDK boards, so that the MMUs for IPU and DSP processors can be
enabled on these boards.

* 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree

: (278 commits)
  ARM: DTS: k2g: Enable eDMA0
  ARM: DTS: k2g: Use the new DT bindings for the eDMA3
  ARM: DTS: dra7: Move the DMA crossbar nodes under l4_cfg/scm
  ARM: DTS: dra7: Use the new DT bindings for the eDMA3
  ARM: DTS: am437x: Use the new DT bindings for the eDMA3
  ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
  dmaengine: ti-dma-crossbar: dra7: Support for reserving DMA event ranges
  dmaengine: ti-dma-crossbar: dra7: Use bitops instead of idr
  dmaengine: ti-dma-crossbar: dra7: Support for eDMA with new bindings
  dmaengine: edma: Add probe callback to edma_tptc_driver
  dmaengine: edma: DT: Change reserved slot array from 16bit to 32bit type
  dmaengine: edma: DT: Change memcpy channel array from 16bit to 32bit type
  dmaengine: edma: predecence bug in GET_NUM_QDMACH()
  dmaengine: edma: fix build without CONFIG_OF
  dmaengine: edma: Add dummy driver skeleton for edma3-tptc
  dmaengine: edma: Fix paRAM slot allocation for entry channel 0
  dmaengine: edma: New device tree binding
  dmaengine: Kconfig: edma: Select TI_DMA_CROSSBAR in case of ARCH_OMAP
  dmaengine: ti-dma-crossbar: Add support for crossbar on AM33xx/AM43xx
  dmaengine: edma: Merge the of parsing functions
  ...

Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
parents b26fe8d3 ca48289f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment