aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-02-17 11:28:29 -0500
committerArnd Bergmann <arnd@arndb.de>2017-02-17 11:28:29 -0500
commita25996e733db057a27a5f90c5636c3e1e01ad33e (patch)
treefcc6b7cca3f01afcce08bfa6998a4fcb3dfdbde0
parent5418820574d2b4d1da092a2f2d770e63d7ac520b (diff)
parent04be87a83db6cbb7586db95b591467c58ae09aee (diff)
Merge tag 'mvebu-dt-4.11-4' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt for 4.11 (part 4)" from Gregory CLEMENT: Fix typos introduced during the preparation of the 4.11 merge window. * tag 'mvebu-dt-4.11-4' of git://git.infradead.org/linux-mvebu: ARM: dts: armada-385-linksys: fix DSA compatible property ARM: dts: Fix typo in armada-xp-98dx4251
-rw-r--r--arch/arm/boot/dts/armada-385-linksys.dtsi2
-rw-r--r--arch/arm/boot/dts/armada-xp-98dx4251.dtsi2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 20d5e8b00f2d..df47bf1ea5eb 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -107,7 +107,7 @@
107 status = "okay"; 107 status = "okay";
108 108
109 switch@0 { 109 switch@0 {
110 compatible = "marvell,mv88e6095"; 110 compatible = "marvell,mv88e6085";
111 #address-cells = <1>; 111 #address-cells = <1>;
112 #size-cells = <0>; 112 #size-cells = <0>;
113 reg = <0>; 113 reg = <0>;
diff --git a/arch/arm/boot/dts/armada-xp-98dx4251.dtsi b/arch/arm/boot/dts/armada-xp-98dx4251.dtsi
index 4b0533a4ccb7..b9d9b269efb4 100644
--- a/arch/arm/boot/dts/armada-xp-98dx4251.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx4251.dtsi
@@ -49,7 +49,7 @@
49 49
50/ { 50/ {
51 model = "Marvell 98DX4251 SoC"; 51 model = "Marvell 98DX4251 SoC";
52 compatible = "marvell,armadaxp-98dx4521", "marvell,armadaxp-98dx3236", "marvell,armadaxp", "marvell,armada-370-xp"; 52 compatible = "marvell,armadaxp-98dx4251", "marvell,armadaxp-98dx3236", "marvell,armadaxp", "marvell,armada-370-xp";
53 53
54 cpus { 54 cpus {
55 cpu@1 { 55 cpu@1 {