[PATCH] dt-bindings: power: xilinx: merge zynqmp-genpd.txt with firmware binding

[PATCH] dt-bindings: power: xilinx: merge zynqmp-genpd.txt with firmware binding

[Naman Trivedi Manojbhai]

Remove the zynqmp-genpd.txt binding. Add the power-domain-cells
property from the zynqmp-genpd.txt binding to firmware binding.

Signed-off-by: Naman Trivedi Manojbhai <naman.trivedimanojbhai@amd.com>
---
 .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 14 ++++++++
 .../bindings/power/xlnx,zynqmp-genpd.txt      | 34 -------------------
 2 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt

diff --git a/Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml b/Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml
index 910bebe6cfa8..822864488dcb 100644
--- a/Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml
+++ b/Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml
@@ -38,6 +38,9 @@ properties:
       - smc
       - hvc
 
+  "#power-domain-cells":
+    const: 1
+
   versal_fpga:
     $ref: /schemas/fpga/xlnx,versal-fpga.yaml#
     description: Compatible of the FPGA device.
@@ -66,6 +69,17 @@ additionalProperties: false
 
 examples:
   - |
+    #include <dt-bindings/power/xlnx-zynqmp-power.h>
+    firmware {
+      zynqmp_firmware: zynqmp-firmware {
+        #power-domain-cells = <1>;
+        };
+    };
+
+    sata {
+      power-domains = <&zynqmp_firmware PD_SATA>;
+    };
+
     versal-firmware {
       compatible = "xlnx,versal-firmware";
       method = "smc";
diff --git a/Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt b/Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt
deleted file mode 100644
index 54b9f9d0f90f..000000000000
--- a/Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt
+++ /dev/null
@@ -1,34 +0,0 @@
------------------------------------------------------------
-Device Tree Bindings for the Xilinx Zynq MPSoC PM domains
------------------------------------------------------------
-The binding for zynqmp-power-controller follow the common
-generic PM domain binding[1].
-
-[1] Documentation/devicetree/bindings/power/power-domain.yaml
-
-== Zynq MPSoC Generic PM Domain Node ==
-
-Required property:
- - Below property should be in zynqmp-firmware node.
- - #power-domain-cells:	Number of cells in a PM domain specifier. Must be 1.
-
-Power domain ID indexes are mentioned in
-include/dt-bindings/power/xlnx-zynqmp-power.h.
-
--------
-Example
--------
-
-firmware {
-	zynqmp_firmware: zynqmp-firmware {
-		...
-		#power-domain-cells = <1>;
-		...
-	};
-};
-
-sata {
-	...
-	power-domains = <&zynqmp_firmware 28>;
-	...
-};
-- 
2.25.1

Re: [PATCH] dt-bindings: power: xilinx: merge zynqmp-genpd.txt with firmware binding

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 361 bytes --]

On Wed, Aug 16, 2023 at 06:03:09AM -0700, Naman Trivedi Manojbhai wrote:
> Remove the zynqmp-genpd.txt binding. Add the power-domain-cells
> property from the zynqmp-genpd.txt binding to firmware binding.
> 
> Signed-off-by: Naman Trivedi Manojbhai <naman.trivedimanojbhai@amd.com>

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH] dt-bindings: power: xilinx: merge zynqmp-genpd.txt with firmware binding

[Rob Herring]

On Wed, 16 Aug 2023 06:03:09 -0700, Naman Trivedi Manojbhai wrote:
> Remove the zynqmp-genpd.txt binding. Add the power-domain-cells
> property from the zynqmp-genpd.txt binding to firmware binding.
> 
> Signed-off-by: Naman Trivedi Manojbhai <naman.trivedimanojbhai@amd.com>
> ---
>  .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 14 ++++++++
>  .../bindings/power/xlnx,zynqmp-genpd.txt      | 34 -------------------
>  2 files changed, 14 insertions(+), 34 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt
> 

Applied, thanks!