tree e6f54fe900945b7c1939757a59aeabc510605a27
parent 5d01410fe4d92081f349b013a2e7a95429e4f2c9
parent a42a7a1fb5f1f9004b023594609dc22da02fc08b
author Arnd Bergmann <arnd@arndb.de> 1417797938 +0100
committer Arnd Bergmann <arnd@arndb.de> 1417797938 +0100
mergetag object a42a7a1fb5f1f9004b023594609dc22da02fc08b
 type commit
 tag of-iommu-configure
 tagger Will Deacon <will.deacon@arm.com> 1417790202 +0000
 
 This series adds automatic IOMMU and DMA-mapping configuration for
 OF-based DMA masters described using the generic IOMMU devicetree
 bindings. Although there is plenty of future work around splitting up
 iommu_ops, adding default IOMMU domains and sorting out automatic IOMMU
 group creation for the platform_bus, this is already useful enough for
 people to port over their IOMMU drivers and start using the new probing
 infrastructure (indeed, Marek has patches queued for the Exynos IOMMU).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCgAGBQJUgcMFAAoJELescNyEwWM0V5kH/A8wDjtibx7ydwvtyvM6Jdd0
 dm5vEVFXEh2ZeyLJUaWCan2ovbSdh8Hu6knJRk5dRsxRKlY/qx039618rkVGzp7M
 yTZ6docSBngeMUSYk6PPrWLJjcv1XN8vMJ+zJRxSNU1M5R27zRMSWvmHhMfg7P8G
 Uz6zUWyx75mJwVkSHy79hSTFaTltHLWU4MhRMdZHxrGE9eDYN+bBmlxfvQvZs+wZ
 i6VFReV7bzOZrNar/bwfcbGzU4DDW5pWOIlfVt7xJMf39FFdZGtc1cS+KPKnIJ0d
 D3q0GlSxY4SeFMWDz49MO88Vbn10s+1h6+EaIvGvqXzrnS9fiacmZdRHTVQ2g34=
 =VFhF
 -----END PGP SIGNATURE-----

Merge tag 'of-iommu-configure' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/iommu-config

Pull "Automatic DMA configuration for OF-based IOMMU masters" from Will Deacon:

This series adds automatic IOMMU and DMA-mapping configuration for
OF-based DMA masters described using the generic IOMMU devicetree
bindings. Although there is plenty of future work around splitting up
iommu_ops, adding default IOMMU domains and sorting out automatic IOMMU
group creation for the platform_bus, this is already useful enough for
people to port over their IOMMU drivers and start using the new probing
infrastructure (indeed, Marek has patches queued for the Exynos IOMMU).

* tag 'of-iommu-configure' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  iommu: store DT-probed IOMMU data privately
  arm: dma-mapping: plumb our iommu mapping ops into arch_setup_dma_ops
  arm: call iommu_init before of_platform_populate
  dma-mapping: detect and configure IOMMU in of_dma_configure
  iommu: fix initialization without 'add_device' callback
  iommu: provide helper function to configure an IOMMU for an of master
  iommu: add new iommu_ops callback for adding an OF device
  dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops
  iommu: provide early initialisation hook for IOMMU drivers

Signed-off-by: Arnd Bergmann <arnd@arndb.de>