aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-385.dtsi
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2014-06-23 16:16:51 +0200
committerJason Cooper <jason@lakedaemon.net>2014-06-24 11:33:24 +0000
commit8dbdb8e704db34085f5978c335c10256b0fb9629 (patch)
tree89c0fb09d02c7770058d7c7d05a019fe66df87e9 /arch/arm/boot/dts/armada-385.dtsi
parentb514fb28ead93332a1660d3ce81def9eb74ed640 (diff)
downloadlinux-linaro-stable-8dbdb8e704db34085f5978c335c10256b0fb9629.tar.gz
ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard
Wildcards in compatible strings should be avoid. "marvell,armada38x" was recently introduced but was not yet used. The armada 385 SoC is a superset of the armada 380 SoC (with more CPUs and more PCIe slots). So this patch replaces the use of "marvell,armada38x" by the "marvell,armada380" string. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1403533011-21339-1-git-send-email-gregory.clement@free-electrons.com Acked-by: Andrew Lunn <andrew@lunn.ch> Cc: <stable@vger.kernel.org> # v3.15+ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-385.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-385.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
index f011009bf4cf..6283d7912f71 100644
--- a/arch/arm/boot/dts/armada-385.dtsi
+++ b/arch/arm/boot/dts/armada-385.dtsi
@@ -16,7 +16,7 @@
/ {
model = "Marvell Armada 385 family SoC";
- compatible = "marvell,armada385", "marvell,armada38x";
+ compatible = "marvell,armada385", "marvell,armada380";
cpus {
#address-cells = <1>;