-
- Downloads
Merge tag 'of-iommu-configure' of...
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>
No related branches found
No related tags found
Showing
- arch/arm/include/asm/dma-mapping.h 6 additions, 6 deletionsarch/arm/include/asm/dma-mapping.h
- arch/arm/kernel/setup.c 2 additions, 0 deletionsarch/arm/kernel/setup.c
- arch/arm/mm/dma-mapping.c 76 additions, 7 deletionsarch/arm/mm/dma-mapping.c
- drivers/iommu/Kconfig 1 addition, 1 deletiondrivers/iommu/Kconfig
- drivers/iommu/iommu.c 1 addition, 1 deletiondrivers/iommu/iommu.c
- drivers/iommu/of_iommu.c 89 additions, 0 deletionsdrivers/iommu/of_iommu.c
- drivers/of/platform.c 26 additions, 24 deletionsdrivers/of/platform.c
- include/asm-generic/vmlinux.lds.h 2 additions, 0 deletionsinclude/asm-generic/vmlinux.lds.h
- include/linux/dma-mapping.h 8 additions, 5 deletionsinclude/linux/dma-mapping.h
- include/linux/iommu.h 8 additions, 0 deletionsinclude/linux/iommu.h
- include/linux/of_iommu.h 23 additions, 0 deletionsinclude/linux/of_iommu.h
Please register or sign in to comment