ARM: dts: armada-xp-matrix: Fix the location of the pcie-controller node

In the dts for the Marvell Armada XP Matrix board the pcie-controller was
located under the internal-regs node whereas it belongs to the soc node.

It means that, until this fix, the pcie could not work for this board
because it didn't match the definition of the pcie-controller node in the
dtsi file. If we had a look on the decompiled dtb file we saw two
different instances of the pcie-controller node: one with the all the
resource set but disabled and the other without any resource but enabled.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
index 6522b04f4a8e7c7a759100153d7d990f1fb160d3..e1509f4c511425a031886c584c9705839b645e87 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-matrix.dts
+++ b/arch/arm/boot/dts/armada-xp-matrix.dts
@@ -71,6 +71,15 @@ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
+               pcie-controller {
+                       status = "okay";
+
+                       pcie@1,0 {
+                               /* Port 0, Lane 0 */
+                               status = "okay";
+                       };
+               };
+
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -99,15 +108,6 @@ fixed-link {
                                };
                        };
 
-                       pcie-controller {
-                               status = "okay";
-
-                               pcie@1,0 {
-                                       /* Port 0, Lane 0 */
-                                       status = "okay";
-                               };
-                       };
-
                        usb@50000 {
                                status = "okay";
                        };