From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH dt-schema] Fix interrupt controllers with interrupt-map
Date: Thu, 28 May 2020 15:23:23 +0200 [thread overview]
Message-ID: <20200528132323.30288-1-geert+renesas@glider.be> (raw)
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(-)
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:
--
2.17.1
next reply other threads:[~2020-05-28 13:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 13:23 Geert Uytterhoeven [this message]
2020-05-29 15:54 ` [PATCH dt-schema] Fix interrupt controllers with interrupt-map Rob Herring
2020-05-29 16:02 ` Geert Uytterhoeven
2020-05-29 21:44 ` Rob Herring
2020-05-30 12:30 ` Geert Uytterhoeven
2020-06-08 20:25 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200528132323.30288-1-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=devicetree@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).