diff options
| author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2014-06-23 16:16:51 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-06-24 11:33:24 +0000 |
| commit | 8dbdb8e704db34085f5978c335c10256b0fb9629 (patch) | |
| tree | 89c0fb09d02c7770058d7c7d05a019fe66df87e9 /arch/arm/boot/dts/armada-38x.dtsi | |
| parent | b514fb28ead93332a1660d3ce81def9eb74ed640 (diff) | |
| download | lwn-8dbdb8e704db34085f5978c335c10256b0fb9629.tar.gz lwn-8dbdb8e704db34085f5978c335c10256b0fb9629.zip | |
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-38x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 3de364e81b52..689fa1a46728 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -20,7 +20,7 @@ / { model = "Marvell Armada 38x family SoC"; - compatible = "marvell,armada38x"; + compatible = "marvell,armada380"; aliases { gpio0 = &gpio0; |