On Fri, Apr 12, 2024 at 11:37:07AM -0700, Tanmay Shah wrote: > Add properties as per new bindings in zynqmp remoteproc node > to represent TCM address and size. > > This patch also adds alternative remoteproc node to represent > remoteproc cluster in split mode. By default lockstep mode is > enabled and users should disable it before using split mode > dts. Both device-tree nodes can't be used simultaneously one > of them must be disabled. For zcu102-1.0 and zcu102-1.1 board > remoteproc split mode dts node is enabled and lockstep mode > dts is disabled. > > Signed-off-by: Tanmay Shah <tanmay.shah@xxxxxxx> > --- > .../boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts | 8 +++ > arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 67 +++++++++++++++++-- > 2 files changed, 70 insertions(+), 5 deletions(-) > Reviewed-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx> > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts > index c8f71a1aec89..495ca94b45db 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts > +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts > @@ -14,6 +14,14 @@ / { > compatible = "xlnx,zynqmp-zcu102-rev1.0", "xlnx,zynqmp-zcu102", "xlnx,zynqmp"; > }; > > +&rproc_split { > + status = "okay"; > +}; > + > +&rproc_lockstep { > + status = "disabled"; > +}; > + > &eeprom { > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > index 25d20d803230..ef31b0fc73d1 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > @@ -260,19 +260,76 @@ fpga_full: fpga-full { > ranges; > }; > > - remoteproc { > + rproc_lockstep: remoteproc@ffe00000 { > compatible = "xlnx,zynqmp-r5fss"; > xlnx,cluster-mode = <1>; > + xlnx,tcm-mode = <1>; > > - r5f-0 { > + #address-cells = <2>; > + #size-cells = <2>; > + > + ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x10000>, > + <0x0 0x20000 0x0 0xffe20000 0x0 0x10000>, > + <0x0 0x10000 0x0 0xffe10000 0x0 0x10000>, > + <0x0 0x30000 0x0 0xffe30000 0x0 0x10000>; > + > + r5f@0 { > + compatible = "xlnx,zynqmp-r5f"; > + reg = <0x0 0x0 0x0 0x10000>, > + <0x0 0x20000 0x0 0x10000>, > + <0x0 0x10000 0x0 0x10000>, > + <0x0 0x30000 0x0 0x10000>; > + reg-names = "atcm0", "btcm0", "atcm1", "btcm1"; > + power-domains = <&zynqmp_firmware PD_RPU_0>, > + <&zynqmp_firmware PD_R5_0_ATCM>, > + <&zynqmp_firmware PD_R5_0_BTCM>, > + <&zynqmp_firmware PD_R5_1_ATCM>, > + <&zynqmp_firmware PD_R5_1_BTCM>; > + memory-region = <&rproc_0_fw_image>; > + }; > + > + r5f@1 { > + compatible = "xlnx,zynqmp-r5f"; > + reg = <0x1 0x0 0x0 0x10000>, <0x1 0x20000 0x0 0x10000>; > + reg-names = "atcm0", "btcm0"; > + power-domains = <&zynqmp_firmware PD_RPU_1>, > + <&zynqmp_firmware PD_R5_1_ATCM>, > + <&zynqmp_firmware PD_R5_1_BTCM>; > + memory-region = <&rproc_1_fw_image>; > + }; > + }; > + > + rproc_split: remoteproc-split@ffe00000 { > + status = "disabled"; > + compatible = "xlnx,zynqmp-r5fss"; > + xlnx,cluster-mode = <0>; > + xlnx,tcm-mode = <0>; > + > + #address-cells = <2>; > + #size-cells = <2>; > + > + ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x10000>, > + <0x0 0x20000 0x0 0xffe20000 0x0 0x10000>, > + <0x1 0x0 0x0 0xffe90000 0x0 0x10000>, > + <0x1 0x20000 0x0 0xffeb0000 0x0 0x10000>; > + > + r5f@0 { > compatible = "xlnx,zynqmp-r5f"; > - power-domains = <&zynqmp_firmware PD_RPU_0>; > + reg = <0x0 0x0 0x0 0x10000>, <0x0 0x20000 0x0 0x10000>; > + reg-names = "atcm0", "btcm0"; > + power-domains = <&zynqmp_firmware PD_RPU_0>, > + <&zynqmp_firmware PD_R5_0_ATCM>, > + <&zynqmp_firmware PD_R5_0_BTCM>; > memory-region = <&rproc_0_fw_image>; > }; > > - r5f-1 { > + r5f@1 { > compatible = "xlnx,zynqmp-r5f"; > - power-domains = <&zynqmp_firmware PD_RPU_1>; > + reg = <0x1 0x0 0x0 0x10000>, <0x1 0x20000 0x0 0x10000>; > + reg-names = "atcm0", "btcm0"; > + power-domains = <&zynqmp_firmware PD_RPU_1>, > + <&zynqmp_firmware PD_R5_1_ATCM>, > + <&zynqmp_firmware PD_R5_1_BTCM>; > memory-region = <&rproc_1_fw_image>; > }; > }; > -- > 2.25.1 >