Commit 7b01cff5 authored by Andreas Färber's avatar Andreas Färber Committed by Gregory CLEMENT
Browse files

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: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
[gregory.clement@free-electrons.com: drop Fixes tag as it is not a bug fix.]
parent fea14498

arch/arm64/boot/dts/marvell/armada-3720-db.dts

+12 −20
Original line number Original line Diff line number Diff line
@@ -60,27 +60,19 @@ memory { 
		device_type = "memory";

		device_type = "memory";

		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;

		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;

	};

	};

};





	soc {

/* CON3 */

		internal-regs {

&sata {

			/*

			* Exported on the micro USB connector CON32

			* through an FTDI

			*/

			uart0: serial@12000 {

	status = "okay";

	status = "okay";

};

};





			/* CON31 */

/* Exported on the micro USB connector CON32 through an FTDI */

			usb3@58000 {

&uart0 {

	status = "okay";

	status = "okay";

};

};





			/* CON3 */

/* CON31 */

			sata@e0000 {

&usb3 {

	status = "okay";

	status = "okay";

};
 
};
 
		};

	};

};

arch/arm64/boot/dts/marvell/armada-372x.dtsi

+0 −1
Original line number Original line Diff line number Diff line
@@ -59,5 +59,4 @@ cpu@1 { 
			enable-method = "psci";

			enable-method = "psci";

		};

		};

	};

	};



};
 
};

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -105,14 +105,14 @@ uart0: serial@12000 { 
				status = "disabled";

				status = "disabled";

			};

			};





			usb3@58000 {

			usb3: usb3@58000 {

				compatible = "generic-xhci";

				compatible = "generic-xhci";

				reg = <0x58000 0x4000>;

				reg = <0x58000 0x4000>;

				interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

				status = "disabled";

			};

			};





			sata@e0000 {

			sata: sata@e0000 {

				compatible = "marvell,armada-3700-ahci";

				compatible = "marvell,armada-3700-ahci";

				reg = <0xe0000 0x2000>;

				reg = <0xe0000 0x2000>;

				interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;