Commit f9d2d86d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Moritz Fischer

dt-bindings: fpga: fpga-region: Convert to sugar syntax

Using overlay sugar syntax makes the DTS files easier to read (and
write).

While at it, fix two build issues:
  - "/dts-v1/" and "/plugin/" must be separate statements.
  - Add a missing closing curly brace.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>
parent 9a8d3cda
...@@ -245,36 +245,31 @@ Base tree contains: ...@@ -245,36 +245,31 @@ Base tree contains:
Overlay contains: Overlay contains:
/dts-v1/ /plugin/; /dts-v1/;
/ { /plugin/;
fragment@0 {
target = <&fpga_region0>; &fpga_region0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
__overlay__ {
#address-cells = <1>; firmware-name = "soc_system.rbf";
#size-cells = <1>; fpga-bridges = <&fpga_bridge1>;
ranges = <0x20000 0xff200000 0x100000>,
firmware-name = "soc_system.rbf"; <0x0 0xc0000000 0x20000000>;
fpga-bridges = <&fpga_bridge1>;
ranges = <0x20000 0xff200000 0x100000>, gpio@10040 {
<0x0 0xc0000000 0x20000000>; compatible = "altr,pio-1.0";
reg = <0x10040 0x20>;
gpio@10040 { altr,ngpio = <4>;
compatible = "altr,pio-1.0"; #gpio-cells = <2>;
reg = <0x10040 0x20>; clocks = <2>;
altr,ngpio = <4>; gpio-controller;
#gpio-cells = <2>; };
clocks = <2>;
gpio-controller; onchip-memory {
}; device_type = "memory";
compatible = "altr,onchipmem-15.1";
onchip-memory { reg = <0x0 0x10000>;
device_type = "memory";
compatible = "altr,onchipmem-15.1";
reg = <0x0 0x10000>;
};
};
}; };
}; };
...@@ -371,25 +366,22 @@ Live Device Tree contains: ...@@ -371,25 +366,22 @@ Live Device Tree contains:
}; };
DT Overlay contains: DT Overlay contains:
/dts-v1/ /plugin/;
/ { /dts-v1/;
fragment@0 { /plugin/;
target = <&fpga_region0>;
&fpga_region0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
__overlay__ {
#address-cells = <1>;
#size-cells = <1>;
firmware-name = "zynq-gpio.bin"; firmware-name = "zynq-gpio.bin";
gpio1: gpio@40000000 { gpio1: gpio@40000000 {
compatible = "xlnx,xps-gpio-1.00.a"; compatible = "xlnx,xps-gpio-1.00.a";
reg = <0x40000000 0x10000>; reg = <0x40000000 0x10000>;
gpio-controller; gpio-controller;
#gpio-cells = <0x2>; #gpio-cells = <0x2>;
xlnx,gpio-width= <0x6>; xlnx,gpio-width= <0x6>;
};
}; };
}; };
...@@ -402,41 +394,37 @@ This example programs the FPGA to have two regions that can later be partially ...@@ -402,41 +394,37 @@ This example programs the FPGA to have two regions that can later be partially
configured. Each region has its own bridge in the FPGA fabric. configured. Each region has its own bridge in the FPGA fabric.
DT Overlay contains: DT Overlay contains:
/dts-v1/ /plugin/;
/ { /dts-v1/;
fragment@0 { /plugin/;
target = <&fpga_region0>;
#address-cells = <1>; &fpga_region0 {
#size-cells = <1>; #address-cells = <1>;
__overlay__ { #size-cells = <1>;
#address-cells = <1>;
#size-cells = <1>; firmware-name = "base.rbf";
firmware-name = "base.rbf"; fpga-bridge@4400 {
compatible = "altr,freeze-bridge-controller";
fpga-bridge@4400 { reg = <0x4400 0x10>;
compatible = "altr,freeze-bridge-controller";
reg = <0x4400 0x10>; fpga_region1: fpga-region1 {
compatible = "fpga-region";
fpga_region1: fpga-region1 { #address-cells = <0x1>;
compatible = "fpga-region"; #size-cells = <0x1>;
#address-cells = <0x1>; ranges;
#size-cells = <0x1>; };
ranges; };
};
}; fpga-bridge@4420 {
compatible = "altr,freeze-bridge-controller";
fpga-bridge@4420 { reg = <0x4420 0x10>;
compatible = "altr,freeze-bridge-controller";
reg = <0x4420 0x10>; fpga_region2: fpga-region2 {
compatible = "fpga-region";
fpga_region2: fpga-region2 { #address-cells = <0x1>;
compatible = "fpga-region"; #size-cells = <0x1>;
#address-cells = <0x1>; ranges;
#size-cells = <0x1>;
ranges;
};
};
}; };
}; };
}; };
...@@ -451,28 +439,23 @@ differences are that the FPGA is partially reconfigured due to the ...@@ -451,28 +439,23 @@ differences are that the FPGA is partially reconfigured due to the
"partial-fpga-config" boolean and the only bridge that is controlled during "partial-fpga-config" boolean and the only bridge that is controlled during
programming is the FPGA based bridge of fpga_region1. programming is the FPGA based bridge of fpga_region1.
/dts-v1/ /plugin/; /dts-v1/;
/ { /plugin/;
fragment@0 {
target = <&fpga_region1>; &fpga_region1 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
__overlay__ {
#address-cells = <1>; firmware-name = "soc_image2.rbf";
#size-cells = <1>; partial-fpga-config;
firmware-name = "soc_image2.rbf"; gpio@10040 {
partial-fpga-config; compatible = "altr,pio-1.0";
reg = <0x10040 0x20>;
gpio@10040 { clocks = <0x2>;
compatible = "altr,pio-1.0"; altr,ngpio = <0x4>;
reg = <0x10040 0x20>; #gpio-cells = <0x2>;
clocks = <0x2>; gpio-controller;
altr,ngpio = <0x4>;
#gpio-cells = <0x2>;
gpio-controller;
};
};
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment