diff options
author | Andreas Färber <afaerber@suse.de> | 2016-03-23 23:24:18 +0100 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-04-27 17:51:50 +0200 |
commit | 7b01cff5ccc3cd6c366ab9040d789e3e5e2debb4 (patch) | |
tree | a5d1ccc0cf4736b1cef1e644c4902ef318722153 /arch/arm64/boot/dts/marvell/armada-3720-db.dts | |
parent | fea144987932dbc88b3051c6d258ffdcace7f1fa (diff) | |
download | linux-stable-7b01cff5ccc3cd6c366ab9040d789e3e5e2debb4.tar.gz linux-stable-7b01cff5ccc3cd6c366ab9040d789e3e5e2debb4.tar.bz2 linux-stable-7b01cff5ccc3cd6c366ab9040d789e3e5e2debb4.zip |
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.]
Diffstat (limited to 'arch/arm64/boot/dts/marvell/armada-3720-db.dts')
-rw-r--r-- | arch/arm64/boot/dts/marvell/armada-3720-db.dts | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts index 359050154511..86110a6ae330 100644 --- 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"; +}; |