Skip to content

Commit 8dbdb8e

Browse files
gclementJason Cooper
authored andcommitted
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 <[email protected]> Link: https://lkml.kernel.org/r/1403533011-21339-1-git-send-email-gregory.clement@free-electrons.com Acked-by: Andrew Lunn <[email protected]> Cc: <[email protected]> # v3.15+ Signed-off-by: Jason Cooper <[email protected]>
1 parent b514fb2 commit 8dbdb8e

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

Documentation/devicetree/bindings/arm/armada-38x.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,15 @@ following property:
66

77
Required root node property:
88

9-
- compatible: must contain either "marvell,armada380" or
10-
"marvell,armada385" depending on the variant of the SoC being used.
9+
- compatible: must contain "marvell,armada380"
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";

arch/arm/boot/dts/armada-380.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/ {
1818
model = "Marvell Armada 380 family SoC";
19-
compatible = "marvell,armada380", "marvell,armada38x";
19+
compatible = "marvell,armada380";
2020

2121
cpus {
2222
#address-cells = <1>;

arch/arm/boot/dts/armada-385-db.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/ {
1818
model = "Marvell Armada 385 Development Board";
19-
compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x";
19+
compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380";
2020

2121
chosen {
2222
bootargs = "console=ttyS0,115200 earlyprintk";

arch/arm/boot/dts/armada-385-rd.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
/ {
1919
model = "Marvell Armada 385 Reference Design";
20-
compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x";
20+
compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
2121

2222
chosen {
2323
bootargs = "console=ttyS0,115200 earlyprintk";

arch/arm/boot/dts/armada-385.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/ {
1818
model = "Marvell Armada 385 family SoC";
19-
compatible = "marvell,armada385", "marvell,armada38x";
19+
compatible = "marvell,armada385", "marvell,armada380";
2020

2121
cpus {
2222
#address-cells = <1>;

arch/arm/boot/dts/armada-38x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
/ {
2222
model = "Marvell Armada 38x family SoC";
23-
compatible = "marvell,armada38x";
23+
compatible = "marvell,armada380";
2424

2525
aliases {
2626
gpio0 = &gpio0;

0 commit comments

Comments
 (0)