linux-kernel - [PATCH 3/3] dt-bindings: firmware: xilinx: Move FPGA schema references under allOf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250206142244.2553237-4-ronak.jain@amd.com>
Date: Thu, 6 Feb 2025 06:22:44 -0800
From: Ronak Jain <ronak.jain@....com>
To: <robh@...nel.org>, <krzk+dt@...nel.org>, <conor+dt@...nel.org>,
	<michal.simek@....com>, <nava.kishore.manne@....com>
CC: <devicetree@...r.kernel.org>, <linux-arm-kernel@...ts.infradead.org>,
	<linux-kernel@...r.kernel.org>, Ronak Jain <ronak.jain@....com>
Subject: [PATCH 3/3] dt-bindings: firmware: xilinx: Move FPGA schema references under allOf

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@....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