diff options
author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2014-06-23 10:16:51 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-06-24 07:33:24 -0400 |
commit | 8dbdb8e704db34085f5978c335c10256b0fb9629 (patch) | |
tree | 89c0fb09d02c7770058d7c7d05a019fe66df87e9 /Documentation/devicetree | |
parent | b514fb28ead93332a1660d3ce81def9eb74ed640 (diff) |
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 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/arm/armada-38x.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/armada-38x.txt b/Documentation/devicetree/bindings/arm/armada-38x.txt index 11f2330a6554..ad9f8ed4d9bd 100644 --- a/Documentation/devicetree/bindings/arm/armada-38x.txt +++ b/Documentation/devicetree/bindings/arm/armada-38x.txt | |||
@@ -6,5 +6,15 @@ following property: | |||
6 | 6 | ||
7 | Required root node property: | 7 | Required root node property: |
8 | 8 | ||
9 | - compatible: must contain either "marvell,armada380" or | 9 | - compatible: must contain "marvell,armada380" |
10 | "marvell,armada385" depending on the variant of the SoC being used. | 10 | |
11 | In addition, boards using the Marvell Armada 385 SoC shall have the | ||
12 | following property before the previous one: | ||
13 | |||
14 | Required root node property: | ||
15 | |||
16 | compatible: must contain "marvell,armada385" | ||
17 | |||
18 | Example: | ||
19 | |||
20 | compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380"; | ||