From: Ronak Jain <ronak.jain@amd.com>
To: <robh@kernel.org>, <krzk+dt@kernel.org>, <conor+dt@kernel.org>,
<michal.simek@amd.com>, <nava.kishore.manne@amd.com>
Cc: <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, Ronak Jain <ronak.jain@amd.com>
Subject: [PATCH 3/3] dt-bindings: firmware: xilinx: Move FPGA schema references under allOf
Date: Thu, 6 Feb 2025 06:22:44 -0800 [thread overview]
Message-ID: <20250206142244.2553237-4-ronak.jain@amd.com> (raw)
In-Reply-To: <20250206142244.2553237-1-ronak.jain@amd.com>
The "pcap" and "versal-fpga" schema references are moved under the
conditional schema "allOf" to align with the expected structure so
that versal-fpga is only available via the versal firmware and pcap
via zynqmp firmware.
Signed-off-by: Ronak Jain <ronak.jain@amd.com>
---
.../bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml b/Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml
index d50438b0fca8..46d18ce4a045 100644
--- a/Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml
+++ b/Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml
@@ -69,7 +69,6 @@ properties:
type: object
pcap:
- $ref: /schemas/fpga/xlnx,zynqmp-pcap-fpga.yaml
description: The ZynqMP SoC uses the PCAP (Processor Configuration Port) to
configure the Programmable Logic (PL). The configuration uses the
firmware interface.
@@ -93,7 +92,6 @@ properties:
type: object
versal-fpga:
- $ref: /schemas/fpga/xlnx,versal-fpga.yaml#
description: Compatible of the FPGA device.
type: object
@@ -115,10 +113,14 @@ allOf:
properties:
pinctrl:
$ref: /schemas/pinctrl/xlnx,zynqmp-pinctrl.yaml#
+ pcap:
+ $ref: /schemas/fpga/xlnx,zynqmp-pcap-fpga.yaml#
else:
properties:
pinctrl:
$ref: /schemas/pinctrl/xlnx,versal-pinctrl.yaml#
+ versal-fpga:
+ $ref: /schemas/fpga/xlnx,versal-fpga.yaml#
required:
- compatible
--
2.34.1
prev parent reply other threads:[~2025-02-06 14:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-06 14:22 [PATCH 0/3] Update firmware dt-bindings Ronak Jain
2025-02-06 14:22 ` [PATCH 1/3] dt-bindings: firmware: xilinx: Add xlnx,zynqmp-firmware compatible Ronak Jain
2025-02-11 22:04 ` Rob Herring (Arm)
2025-02-06 14:22 ` [PATCH 2/3] dt-bindings: firmware: xilinx: Add conditional pinctrl schema Ronak Jain
2025-02-11 21:53 ` Rob Herring
2025-02-13 11:16 ` Jain, Ronak
2025-02-20 12:18 ` Jain, Ronak
2025-03-04 6:15 ` Jain, Ronak
2025-09-17 7:28 ` Jain, Ronak
2025-02-06 14:22 ` Ronak Jain [this message]
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=20250206142244.2553237-4-ronak.jain@amd.com \
--to=ronak.jain@amd.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=nava.kishore.manne@amd.com \
--cc=robh@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.