diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-22 08:56:00 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-22 08:58:59 -0500 |
| commit | 203a0d417293622da7c90eda0cb92f5976a10e42 (patch) | |
| tree | 755c0d632b442d329fc5ea39bd8fde6d2d57366d | |
| parent | 847aed392fe7d101057a7c4b85c11542a961b817 (diff) | |
| parent | 6a3b25173cd4c6c2cd1ad6f1a3a0a85b488597ed (diff) | |
Merge tag 'mvebu-dt-5.1-2' of git://git.infradead.org/linux-mvebu into arm/dt
mvebu dt for 5.1 (part 2)
Follow-up fixing DT warning introduced by previous pull request
* tag 'mvebu-dt-5.1-2' of git://git.infradead.org/linux-mvebu:
arch: arm: dts: kirkwood-rd88f6281: Remove disabled marvell,dsa reference
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts index a9fee2c2bcaf..9d88301daf0e 100644 --- a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts +++ b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | |||
| @@ -16,15 +16,6 @@ | |||
| 16 | model = "Marvell RD88f6281 Reference design, with Z0 SoC"; | 16 | model = "Marvell RD88f6281 Reference design, with Z0 SoC"; |
| 17 | compatible = "marvell,rd88f6281-z0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood"; | 17 | compatible = "marvell,rd88f6281-z0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood"; |
| 18 | 18 | ||
| 19 | dsa { | ||
| 20 | switch@0 { | ||
| 21 | reg = <0 0>; /* MDIO address 0, switch 0 in tree */ | ||
| 22 | port@4 { | ||
| 23 | reg = <4>; | ||
| 24 | label = "wan"; | ||
| 25 | }; | ||
| 26 | }; | ||
| 27 | }; | ||
| 28 | }; | 19 | }; |
| 29 | 20 | ||
| 30 | ð1 { | 21 | ð1 { |
