From 31e02e7a5232f0db09972109194e78c51ef22ca2 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 21 Oct 2015 15:19:45 +0200 Subject: [PATCH] ARM64: zynqmp: Move xlnx_dpdma node Sort nodes. Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp.dtsi | 63 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index dd5ee1bdac8..683cf765607 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -602,38 +602,6 @@ }; }; - /* needs to be reviewed and put to the right location */ - xlnx_dpdma: dma@0xfd4c0000 { - compatible = "xlnx,dpdma"; - status = "disabled"; - reg = <0x0 0xfd4c0000 0x1000>; - interrupts = <0 122 4>; - interrupt-parent = <&gic>; - clocks = <&misc_clk>; - clock-names = "axi_clk"; - xlnx,axi-clock-freq = <200000000>; - dma-channels = <6>; - #dma-cells = <1>; - dma-video0channel@43c10000 { - compatible = "xlnx,video0"; - }; - dma-video1channel@43c10000 { - compatible = "xlnx,video1"; - }; - dma-video2channel@43c10000 { - compatible = "xlnx,video2"; - }; - dma-graphicschannel@43c10000 { - compatible = "xlnx,graphics"; - }; - dma-audio0channel@43c10000 { - compatible = "xlnx,audio0"; - }; - dma-audio1channel@43c10000 { - compatible = "xlnx,audio1"; - }; - }; - dp_aclk: clock0 { compatible = "fixed-clock"; #clock-cells = <0>; @@ -703,5 +671,36 @@ reg-names = "blend", "av_buf", "aud"; xlnx,output-fmt = "rgb"; }; + + xlnx_dpdma: dma@fd4c0000 { + compatible = "xlnx,dpdma"; + status = "disabled"; + reg = <0x0 0xfd4c0000 0x1000>; + interrupts = <0 122 4>; + interrupt-parent = <&gic>; + clocks = <&misc_clk>; + clock-names = "axi_clk"; + xlnx,axi-clock-freq = <200000000>; + dma-channels = <6>; + #dma-cells = <1>; + dma-video0channel@43c10000 { + compatible = "xlnx,video0"; + }; + dma-video1channel@43c10000 { + compatible = "xlnx,video1"; + }; + dma-video2channel@43c10000 { + compatible = "xlnx,video2"; + }; + dma-graphicschannel@43c10000 { + compatible = "xlnx,graphics"; + }; + dma-audio0channel@43c10000 { + compatible = "xlnx,audio0"; + }; + dma-audio1channel@43c10000 { + compatible = "xlnx,audio1"; + }; + }; }; }; -- 2.47.3