| Message ID | 20151117035320.30676.88818.sendpatchset@little-apple (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Tue, Nov 17, 2015 at 12:53:20PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Add part numbers for APE6 and current set of R-Car Gen2 SoCs to the > IPMMU DT binding documentation. The example is also updated to show > how the generic compatible string may be used as fallback. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Simon Horman <horms+renesas@verge.net.au> -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 17, 2015 at 12:53:20PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Add part numbers for APE6 and current set of R-Car Gen2 SoCs to the > IPMMU DT binding documentation. The example is also updated to show > how the generic compatible string may be used as fallback. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Rob Herring <robh@kernel.org> > --- > > Changes since V1: > - Updated compat string section to the following: > "Must contain SoC-specific and generic entries from below." > > Thanks to Laurent for feedback! > > Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt | 12 ++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > --- 0001/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt > +++ work/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt 2015-11-17 12:45:26.080513000 +0900 > @@ -7,7 +7,15 @@ connected to the IPMMU through a port ca > > Required Properties: > > - - compatible: Must contain "renesas,ipmmu-vmsa". > + - compatible: Must contain SoC-specific and generic entries from below. > + > + - "renesas,ipmmu-r8a73a4" for the R8A73A4 (R-Mobile APE6) IPMMU. > + - "renesas,ipmmu-r8a7790" for the R8A7790 (R-Car H2) IPMMU. > + - "renesas,ipmmu-r8a7791" for the R8A7791 (R-Car M2-W) IPMMU. > + - "renesas,ipmmu-r8a7793" for the R8A7793 (R-Car M2-N) IPMMU. > + - "renesas,ipmmu-r8a7794" for the R8A7794 (R-Car E2) IPMMU. > + - "renesas,ipmmu-vmsa" for generic R-Car Gen2 VMSA-compatible IPMMU. > + > - reg: Base address and size of the IPMMU registers. > - interrupts: Specifiers for the MMU fault interrupts. For instances that > support secure mode two interrupts must be specified, for non-secure and > @@ -27,7 +35,7 @@ node with the following property: > Example: R8A7791 IPMMU-MX and VSP1-D0 bus master > > ipmmu_mx: mmu@fe951000 { > - compatible = "renasas,ipmmu-vmsa"; > + compatible = "renasas,ipmmu-r8a7791", "renasas,ipmmu-vmsa"; > reg = <0 0xfe951000 0 0x1000>; > interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>, > <0 221 IRQ_TYPE_LEVEL_HIGH>; -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 17, 2015 at 12:53:20PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Add part numbers for APE6 and current set of R-Car Gen2 SoCs to the > IPMMU DT binding documentation. The example is also updated to show > how the generic compatible string may be used as fallback. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 0001/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt +++ work/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt 2015-11-17 12:45:26.080513000 +0900 @@ -7,7 +7,15 @@ connected to the IPMMU through a port ca Required Properties: - - compatible: Must contain "renesas,ipmmu-vmsa". + - compatible: Must contain SoC-specific and generic entries from below. + + - "renesas,ipmmu-r8a73a4" for the R8A73A4 (R-Mobile APE6) IPMMU. + - "renesas,ipmmu-r8a7790" for the R8A7790 (R-Car H2) IPMMU. + - "renesas,ipmmu-r8a7791" for the R8A7791 (R-Car M2-W) IPMMU. + - "renesas,ipmmu-r8a7793" for the R8A7793 (R-Car M2-N) IPMMU. + - "renesas,ipmmu-r8a7794" for the R8A7794 (R-Car E2) IPMMU. + - "renesas,ipmmu-vmsa" for generic R-Car Gen2 VMSA-compatible IPMMU. + - reg: Base address and size of the IPMMU registers. - interrupts: Specifiers for the MMU fault interrupts. For instances that support secure mode two interrupts must be specified, for non-secure and @@ -27,7 +35,7 @@ node with the following property: Example: R8A7791 IPMMU-MX and VSP1-D0 bus master ipmmu_mx: mmu@fe951000 { - compatible = "renasas,ipmmu-vmsa"; + compatible = "renasas,ipmmu-r8a7791", "renasas,ipmmu-vmsa"; reg = <0 0xfe951000 0 0x1000>; interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>, <0 221 IRQ_TYPE_LEVEL_HIGH>;