Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a188cf8d authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branch 'for-joerg/arm-smmu/updates' of... 

Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
parents cd3de83f 2907320d

Documentation/devicetree/bindings/iommu/arm,smmu.txt

+0 −6
Original line number Diff line number Diff line
@@ -42,12 +42,6 @@ conditions. 


** System MMU optional properties:



- smmu-parent   : When multiple SMMUs are chained together, this

                  property can be used to provide a phandle to the

                  parent SMMU (that is the next SMMU on the path going

                  from the mmu-masters towards memory) node for this

                  SMMU.



- calxeda,smmu-secure-config-access : Enable proper handling of buggy

                  implementations that always use secure access to

                  SMMU configuration registers. In this case non-secure

drivers/iommu/arm-smmu.c

+240 −253

File changed.

Preview size limit exceeded, changes collapsed.