Skip to contentSkip to conversation

iommu/ipmmu-vmsa: Include SoC part number in DT binding docs

PATCH Applied Magnus Damm 4 participants 4 messages Nov 17, 2015 – Nov 26, 2015

Subsystems (3)
Device tree bindings SuperH IOMMU
lore
Share & tools
lore

Magnus Damm

author
#0 lore raw

PATCH v2 1/1 iommu/ipmmu-vmsa: Include SoC part number in DT binding docs

From: Magnus Damm <[email protected]>

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 <[email protected]>

---

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(-)
Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt +10 -2
@@ -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>;
Acked-by on v2 1/1
#2 lore raw
In reply to Magnus Damm
Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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 <[email protected]>
Acked-by Rob Herring <[email protected]>
Quoted 31 lines

---

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(-)
Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt +9 -1
@@ -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

Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt node with the following property: · line 41

Quoted 8 lines
Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt +1 -1
@@ -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 devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied
#3 lore raw
In reply to Magnus Damm
Quoted 7 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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 <[email protected]>

Applied, thanks.

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html