On Thu, Nov 12, 2020 at 02:41:13PM +0530, Yash Shah wrote: > The L2 cache controller in SiFive FU740 has 4 ECC interrupt sources as > compared to 3 in FU540. Update the DT documentation accordingly with > "compatible" and "interrupt" property changes. > > Signed-off-by: Yash Shah <yash.shah@xxxxxxxxxx> > --- > .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 33 +++++++++++++++++----- > 1 file changed, 26 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml b/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml > index efc0198..4873d5c 100644 > --- a/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml > +++ b/Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml > @@ -27,6 +27,7 @@ select: > items: > - enum: > - sifive,fu540-c000-ccache > + - sifive,fu740-c000-ccache > > required: > - compatible > @@ -34,7 +35,9 @@ select: > properties: > compatible: > items: > - - const: sifive,fu540-c000-ccache > + - enum: > + - sifive,fu540-c000-ccache > + - sifive,fu740-c000-ccache > - const: cache > > cache-block-size: > @@ -51,12 +54,6 @@ properties: > > cache-unified: true > > - interrupts: > - description: | > - Must contain entries for DirError, DataError and DataFail signals. > - minItems: 3 > - maxItems: 3 Keep this here and just change maxItems to 4. Really, what each interrupt is should be listed out as an 'items' entry. > - > reg: > maxItems: 1 > > @@ -67,6 +64,28 @@ properties: > The reference to the reserved-memory for the L2 Loosely Integrated Memory region. > The reserved memory node should be defined as per the bindings in reserved-memory.txt. > > +if: > + properties: > + compatible: > + contains: > + const: sifive,fu540-c000-ccache > + > +then: > + properties: > + interrupts: > + description: | > + Must contain entries for DirError, DataError and DataFail signals. > + minItems: 3 > + maxItems: 3 Here you just need 'maxItems: 3'. > + > +else: > + properties: > + interrupts: > + description: | > + Must contain entries for DirError, DirFail, DataError, DataFail signals. DirFail should be last so you keep the same indices. > + minItems: 4 > + maxItems: 4 And 'minItems: 4' > + > additionalProperties: false > > required: > -- > 2.7.4 >
