| Message ID | 20200528132323.30288-1-geert+renesas@glider.be |
|---|---|
| State | New |
| Headers | show |
| Series | [dt-schema] Fix interrupt controllers with interrupt-map | expand |
diff --git a/meta-schemas/interrupts.yaml b/meta-schemas/interrupts.yaml index 7073063486d44dab..93d8e4cafca679d3 100644 --- a/meta-schemas/interrupts.yaml +++ b/meta-schemas/interrupts.yaml @@ -26,7 +26,7 @@ properties: dependencies: interrupt-map: ['#interrupt-cells', 'interrupt-map-mask'] '#interrupt-cells': - oneOf: + anyOf: - required: - interrupt-controller - required: diff --git a/schemas/interrupt-controller.yaml b/schemas/interrupt-controller.yaml index f65d5f6d2f1ac524..5dce87d839959489 100644 --- a/schemas/interrupt-controller.yaml +++ b/schemas/interrupt-controller.yaml @@ -30,7 +30,7 @@ dependencies: interrupt-controller: ['#interrupt-cells'] interrupt-map: ['#interrupt-cells', 'interrupt-map-mask'] "#interrupt-cells": - oneOf: + anyOf: - required: - interrupt-controller - required:
When an interrupt controller has an "interrupt-map" property, an "is valid under each of" error is triggered. Fix this by allowing "interrupt-controller" and "interrupt-map" to coexist, in both the interrrupts meta-schema and the interrupt-controller schema. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- meta-schemas/interrupts.yaml | 2 +- schemas/interrupt-controller.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)