arm64: dts: marvell: clean up armada-7040-db

Instead of duplicating the node hierarchy, reference the nodes by label,
adding labels where necessary.

Drop some trailing or inconsistent white lines while at it.

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
[Thomas: drop Fixes tag as it is not a bug fix.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 064a251346dd93f87d59a1c17c78de6bf7a3bfea..ee5778395beabf8cfa8b52e0db9033fae0569637 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -55,38 +55,34 @@
                device_type = "memory";
                reg = <0x0 0x0 0x0 0x80000000>;
        };
+};
 
-       ap806 {
-               config-space {
-                       spi@510600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "n25q128a13";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <10000000>;
+&i2c0 {
+       status = "okay";
+       clock-frequency = <100000>;
+};
 
-                                       partition@0 {
-                                               label = "U-Boot";
-                                               reg = <0 0x200000>;
-                                       };
-                                       partition@400000 {
-                                               label = "Filesystem";
-                                               reg = <0x200000 0xce0000>;
-                                       };
-                               };
-                       };
+&spi0 {
+       status = "okay";
 
-                       i2c@511000 {
-                               status = "okay";
-                               clock-frequency = <100000>;
-                       };
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "n25q128a13";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <10000000>;
 
-                       serial@512000 {
-                               status = "okay";
-                       };
+               partition@0 {
+                       label = "U-Boot";
+                       reg = <0 0x200000>;
+               };
+               partition@400000 {
+                       label = "Filesystem";
+                       reg = <0x200000 0xce0000>;
                };
        };
 };
+
+&uart0 {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
index f25c5c17fad75de71e60ade443e1f1cd5f162e33..95a1ff60f6c1318998db8b214a496d5a6f79dbb9 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
@@ -68,4 +68,3 @@
                };
        };
 };
-

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
index baa7d9a516b3cd2f76e41294142ecc3a52e55589..ba43a4357b8942a66e4d25fb901e5543e0dfcdea 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
@@ -79,6 +79,4 @@
                        enable-method = "psci";
                };
        };
-
 };
-

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 556a92bcc2f600ce0d486c597feb9493875653d1..3ecf9b1798faf9f9567266ec8560a5239a309197 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -59,7 +59,6 @@
                method = "smc";
        };
 
-
        ap806 {
                #address-cells = <2>;
                #size-cells = <2>;
@@ -190,7 +189,7 @@
                                status = "disabled";
                        };
 
-                       serial@512000 {
+                       uart0: serial@512000 {
                                compatible = "snps,dw-apb-uart";
                                reg = <0x512000 0x100>;
                                reg-shift = <2>;
@@ -200,7 +199,7 @@
                                status = "disabled";
                        };
 
-                       serial@512100 {
+                       uart1: serial@512100 {
                                compatible = "snps,dw-apb-uart";
                                reg = <0x512100 0x100>;
                                reg-shift = <2>;
@@ -232,6 +231,4 @@
                        };
                };
        };
-
 };
-