Skip to content

Commit b67ab6f

Browse files
shimodayjoergroedel
authored andcommitted
dt-bindings: iommu: renesas, ipmmu-vmsa: Update for R-Car Gen4
Since R-Car Gen4 does not have the main IPMMU IMSSTR register, update the bindings to drop the interrupt bit number from the renesas,ipmmu-main property. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> [geert: Re-add removed items level, add minItems/maxItems constraints] Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20230313124026.954514-1-yoshihiro.shimoda.uh@renesas.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent efe37fd commit b67ab6f

1 file changed

Lines changed: 24 additions & 8 deletions

File tree

Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ properties:
7474
renesas,ipmmu-main:
7575
$ref: /schemas/types.yaml#/definitions/phandle-array
7676
items:
77-
- items:
77+
- minItems: 1
78+
items:
7879
- description: phandle to main IPMMU
79-
- description: the interrupt bit number associated with the particular
80-
cache IPMMU device. The interrupt bit number needs to match the main
81-
IPMMU IMSSTR register. Only used by cache IPMMU instances.
80+
- description:
81+
The interrupt bit number associated with the particular cache
82+
IPMMU device. If present, the interrupt bit number needs to match
83+
the main IPMMU IMSSTR register. Only used by cache IPMMU
84+
instances.
8285
description:
83-
Reference to the main IPMMU phandle plus 1 cell. The cell is
84-
the interrupt bit number associated with the particular cache IPMMU
85-
device. The interrupt bit number needs to match the main IPMMU IMSSTR
86-
register. Only used by cache IPMMU instances.
86+
Reference to the main IPMMU.
8787

8888
required:
8989
- compatible
@@ -109,6 +109,22 @@ allOf:
109109
required:
110110
- power-domains
111111

112+
- if:
113+
properties:
114+
compatible:
115+
contains:
116+
const: renesas,rcar-gen4-ipmmu-vmsa
117+
then:
118+
properties:
119+
renesas,ipmmu-main:
120+
items:
121+
- maxItems: 1
122+
else:
123+
properties:
124+
renesas,ipmmu-main:
125+
items:
126+
- minItems: 2
127+
112128
examples:
113129
- |
114130
#include <dt-bindings/clock/r8a7791-cpg-mssr.h>

0 commit comments

Comments
 (0)