summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrzegorz Jaszczyk <jaz@semihalf.com>2016-08-04 12:14:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-16 17:50:38 +0200
commitdc799eb52ddcf43b0ca5778e27db40a976d87f01 (patch)
treee88d8b2b8c3b523d4efadc915cccc342c5a1b935
parentd276697d36e1035099848f90915a32d72245d510 (diff)
downloadlinux-stable-dc799eb52ddcf43b0ca5778e27db40a976d87f01.tar.gz
linux-stable-dc799eb52ddcf43b0ca5778e27db40a976d87f01.tar.bz2
linux-stable-dc799eb52ddcf43b0ca5778e27db40a976d87f01.zip
ARM: dts: mvebu: armada-390: add missing compatibility string and bracket
commit 061492cfad9f11dbc32df741a7164f307b69b6e6 upstream. The armada-390.dtsi was broken since the first patch which adds Device Tree files for Armada 39x SoC was introduced. Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Fixes 538da83 ("ARM: mvebu: add Device Tree files for Armada 39x SoC and board") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--arch/arm/boot/dts/armada-390.dtsi3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-390.dtsi b/arch/arm/boot/dts/armada-390.dtsi
index 094e39c66039..6cd18d8aaac7 100644
--- a/arch/arm/boot/dts/armada-390.dtsi
+++ b/arch/arm/boot/dts/armada-390.dtsi
@@ -47,6 +47,8 @@
#include "armada-39x.dtsi"
/ {
+ compatible = "marvell,armada390";
+
soc {
internal-regs {
pinctrl@18000 {
@@ -54,4 +56,5 @@
reg = <0x18000 0x20>;
};
};
+ };
};