arm64: zynqmp: Sync alignment with mainline

Sync pcie and lpd_dma nodes with mainline version.
Incorrect locations are causing diff in statistics that's why
synchronizations are needed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 5bdab611645166d036f649975780175d0ad86ea2..e71399f83d273501442bcf77ef6cc058ddccc70f 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -547,10 +547,10 @@
                lpd_dma_chan1: dma@ffa80000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       clock-names = "clk_main", "clk_apb";
                        reg = <0x0 0xffa80000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 77 4>;
+                       clock-names = "clk_main", "clk_apb";
                        xlnx,bus-width = <64>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x868>;
@@ -560,10 +560,10 @@
                lpd_dma_chan2: dma@ffa90000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       clock-names = "clk_main", "clk_apb";
                        reg = <0x0 0xffa90000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 78 4>;
+                       clock-names = "clk_main", "clk_apb";
                        xlnx,bus-width = <64>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x869>;
@@ -573,10 +573,10 @@
                lpd_dma_chan3: dma@ffaa0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       clock-names = "clk_main", "clk_apb";
                        reg = <0x0 0xffaa0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 79 4>;
+                       clock-names = "clk_main", "clk_apb";
                        xlnx,bus-width = <64>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x86a>;
@@ -586,10 +586,10 @@
                lpd_dma_chan4: dma@ffab0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       clock-names = "clk_main", "clk_apb";
                        reg = <0x0 0xffab0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 80 4>;
+                       clock-names = "clk_main", "clk_apb";
                        xlnx,bus-width = <64>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x86b>;
@@ -599,10 +599,10 @@
                lpd_dma_chan5: dma@ffac0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       clock-names = "clk_main", "clk_apb";
                        reg = <0x0 0xffac0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 81 4>;
+                       clock-names = "clk_main", "clk_apb";
                        xlnx,bus-width = <64>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x86c>;
@@ -612,10 +612,10 @@
                lpd_dma_chan6: dma@ffad0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       clock-names = "clk_main", "clk_apb";
                        reg = <0x0 0xffad0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 82 4>;
+                       clock-names = "clk_main", "clk_apb";
                        xlnx,bus-width = <64>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x86d>;
@@ -625,10 +625,10 @@
                lpd_dma_chan7: dma@ffae0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       clock-names = "clk_main", "clk_apb";
                        reg = <0x0 0xffae0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 83 4>;
+                       clock-names = "clk_main", "clk_apb";
                        xlnx,bus-width = <64>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x86e>;
@@ -638,10 +638,10 @@
                lpd_dma_chan8: dma@ffaf0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       clock-names = "clk_main", "clk_apb";
                        reg = <0x0 0xffaf0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 84 4>;
+                       clock-names = "clk_main", "clk_apb";
                        xlnx,bus-width = <64>;
                        #stream-id-cells = <1>;
                        iommus = <&smmu 0x86f>;
@@ -781,7 +781,8 @@
                                     <0 116 4>,
                                     <0 115 4>, /* MSI_1 [63...32] */
                                     <0 114 4>; /* MSI_0 [31...0] */
-                       interrupt-names = "misc","dummy","intx", "msi1", "msi0";
+                       interrupt-names = "misc", "dummy", "intx",
+                                         "msi1", "msi0";
                        msi-parent = <&pcie>;
                        reg = <0x0 0xfd0e0000 0x0 0x1000>,
                              <0x0 0xfd480000 0x0 0x1000>,