arm64: dts: marvell: Clean up armada-3720-db

Instead of duplicating the SoC's node hierarchy, including a bus node
named "internal-regs", reference the actually desired nodes by label,
like Berlin already does. Add labels where necessary.

Drop an inconsistent white line while at it.
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
[gregory.clement@free-electrons.com: drop Fixes tag as it is not a bug fix.]

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 3590501545116dfc7de3ded7bbc5899b1d571420..86110a6ae33095ac5af652a80052ac566b5f9c7b 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -60,27 +60,19 @@
                device_type = "memory";
                reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
        };
+};
 
-       soc {
-               internal-regs {
-                       /*
-                       * Exported on the micro USB connector CON32
-                       * through an FTDI
-                       */
-                       uart0: serial@12000 {
-                               status = "okay";
-                       };
-
-                       /* CON31 */
-                       usb3@58000 {
-                               status = "okay";
-                       };
+/* CON3 */
+&sata {
+       status = "okay";
+};
 
-                       /* CON3 */
-                       sata@e0000 {
-                              status = "okay";
-                       };
-               };
-       };
+/* Exported on the micro USB connector CON32 through an FTDI */
+&uart0 {
+       status = "okay";
 };
 
+/* CON31 */
+&usb3 {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
index f292a00ce97cb11cd01923422fd538cfef544dd4..5120296596c265508e520e12b0ee8b4a072aa5e6 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
@@ -59,5 +59,4 @@
                        enable-method = "psci";
                };
        };
-
 };

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index ba9df7ff2a725a438fcd615cbf93781947120283..4328c2408a8aa7f7619e3d048f6ea7771db67967 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -105,14 +105,14 @@
                                status = "disabled";
                        };
 
-                       usb3@58000 {
+                       usb3: usb3@58000 {
                                compatible = "generic-xhci";
                                reg = <0x58000 0x4000>;
                                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
-                       sata@e0000 {
+                       sata: sata@e0000 {
                                compatible = "marvell,armada-3700-ahci";
                                reg = <0xe0000 0x2000>;
                                interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;