[PATCH 3/3] arm64: zynqmp: Rename dma to dma-controller

[Michal Simek]

On 1/12/22 16:15, Michael Tretter wrote:
> The ZynqMP dma engines are actually dma-controllers as specified by the
> device tree binding. Rename the device tree nodes accordingly.
> 
> Signed-off-by: Michael Tretter <m.tretter at pengutronix.de>
> ---
>   arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 32 +++++++++++++-------------
>   1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index 6d96b6b99f84..3e15391e5b37 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -254,7 +254,7 @@ pmu at 9000 {
>   		};
>   
>   		/* GDMA */
> -		fpd_dma_chan1: dma at fd500000 {
> +		fpd_dma_chan1: dma-controller at fd500000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xfd500000 0x0 0x1000>;
> @@ -267,7 +267,7 @@ fpd_dma_chan1: dma at fd500000 {
>   			power-domains = <&zynqmp_firmware PD_GDMA>;
>   		};
>   
> -		fpd_dma_chan2: dma at fd510000 {
> +		fpd_dma_chan2: dma-controller at fd510000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xfd510000 0x0 0x1000>;
> @@ -280,7 +280,7 @@ fpd_dma_chan2: dma at fd510000 {
>   			power-domains = <&zynqmp_firmware PD_GDMA>;
>   		};
>   
> -		fpd_dma_chan3: dma at fd520000 {
> +		fpd_dma_chan3: dma-controller at fd520000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xfd520000 0x0 0x1000>;
> @@ -293,7 +293,7 @@ fpd_dma_chan3: dma at fd520000 {
>   			power-domains = <&zynqmp_firmware PD_GDMA>;
>   		};
>   
> -		fpd_dma_chan4: dma at fd530000 {
> +		fpd_dma_chan4: dma-controller at fd530000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xfd530000 0x0 0x1000>;
> @@ -306,7 +306,7 @@ fpd_dma_chan4: dma at fd530000 {
>   			power-domains = <&zynqmp_firmware PD_GDMA>;
>   		};
>   
> -		fpd_dma_chan5: dma at fd540000 {
> +		fpd_dma_chan5: dma-controller at fd540000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xfd540000 0x0 0x1000>;
> @@ -319,7 +319,7 @@ fpd_dma_chan5: dma at fd540000 {
>   			power-domains = <&zynqmp_firmware PD_GDMA>;
>   		};
>   
> -		fpd_dma_chan6: dma at fd550000 {
> +		fpd_dma_chan6: dma-controller at fd550000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xfd550000 0x0 0x1000>;
> @@ -332,7 +332,7 @@ fpd_dma_chan6: dma at fd550000 {
>   			power-domains = <&zynqmp_firmware PD_GDMA>;
>   		};
>   
> -		fpd_dma_chan7: dma at fd560000 {
> +		fpd_dma_chan7: dma-controller at fd560000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xfd560000 0x0 0x1000>;
> @@ -345,7 +345,7 @@ fpd_dma_chan7: dma at fd560000 {
>   			power-domains = <&zynqmp_firmware PD_GDMA>;
>   		};
>   
> -		fpd_dma_chan8: dma at fd570000 {
> +		fpd_dma_chan8: dma-controller at fd570000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xfd570000 0x0 0x1000>;
> @@ -375,7 +375,7 @@ gic: interrupt-controller at f9010000 {
>   		 * These dma channels, Users should ensure that these dma
>   		 * Channels are allowed for non secure access.
>   		 */
> -		lpd_dma_chan1: dma at ffa80000 {
> +		lpd_dma_chan1: dma-controller at ffa80000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xffa80000 0x0 0x1000>;
> @@ -388,7 +388,7 @@ lpd_dma_chan1: dma at ffa80000 {
>   			power-domains = <&zynqmp_firmware PD_ADMA>;
>   		};
>   
> -		lpd_dma_chan2: dma at ffa90000 {
> +		lpd_dma_chan2: dma-controller at ffa90000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xffa90000 0x0 0x1000>;
> @@ -401,7 +401,7 @@ lpd_dma_chan2: dma at ffa90000 {
>   			power-domains = <&zynqmp_firmware PD_ADMA>;
>   		};
>   
> -		lpd_dma_chan3: dma at ffaa0000 {
> +		lpd_dma_chan3: dma-controller at ffaa0000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xffaa0000 0x0 0x1000>;
> @@ -414,7 +414,7 @@ lpd_dma_chan3: dma at ffaa0000 {
>   			power-domains = <&zynqmp_firmware PD_ADMA>;
>   		};
>   
> -		lpd_dma_chan4: dma at ffab0000 {
> +		lpd_dma_chan4: dma-controller at ffab0000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xffab0000 0x0 0x1000>;
> @@ -427,7 +427,7 @@ lpd_dma_chan4: dma at ffab0000 {
>   			power-domains = <&zynqmp_firmware PD_ADMA>;
>   		};
>   
> -		lpd_dma_chan5: dma at ffac0000 {
> +		lpd_dma_chan5: dma-controller at ffac0000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xffac0000 0x0 0x1000>;
> @@ -440,7 +440,7 @@ lpd_dma_chan5: dma at ffac0000 {
>   			power-domains = <&zynqmp_firmware PD_ADMA>;
>   		};
>   
> -		lpd_dma_chan6: dma at ffad0000 {
> +		lpd_dma_chan6: dma-controller at ffad0000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xffad0000 0x0 0x1000>;
> @@ -453,7 +453,7 @@ lpd_dma_chan6: dma at ffad0000 {
>   			power-domains = <&zynqmp_firmware PD_ADMA>;
>   		};
>   
> -		lpd_dma_chan7: dma at ffae0000 {
> +		lpd_dma_chan7: dma-controller at ffae0000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xffae0000 0x0 0x1000>;
> @@ -466,7 +466,7 @@ lpd_dma_chan7: dma at ffae0000 {
>   			power-domains = <&zynqmp_firmware PD_ADMA>;
>   		};
>   
> -		lpd_dma_chan8: dma at ffaf0000 {
> +		lpd_dma_chan8: dma-controller at ffaf0000 {
>   			status = "disabled";
>   			compatible = "xlnx,zynqmp-dma-1.0";
>   			reg = <0x0 0xffaf0000 0x0 0x1000>;

Applied.
M