Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Gregory CLEMENT and committed by
Jason Cooper
8dbdb8e7 b514fb28

+17 -7
+12 -2
Documentation/devicetree/bindings/arm/armada-38x.txt
··· 6 6 7 7 Required root node property: 8 8 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";
+1 -1
arch/arm/boot/dts/armada-380.dtsi
··· 16 16 17 17 / { 18 18 model = "Marvell Armada 380 family SoC"; 19 - compatible = "marvell,armada380", "marvell,armada38x"; 19 + compatible = "marvell,armada380"; 20 20 21 21 cpus { 22 22 #address-cells = <1>;
+1 -1
arch/arm/boot/dts/armada-385-db.dts
··· 16 16 17 17 / { 18 18 model = "Marvell Armada 385 Development Board"; 19 - compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x"; 19 + compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380"; 20 20 21 21 chosen { 22 22 bootargs = "console=ttyS0,115200 earlyprintk";
+1 -1
arch/arm/boot/dts/armada-385-rd.dts
··· 17 17 18 18 / { 19 19 model = "Marvell Armada 385 Reference Design"; 20 - compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x"; 20 + compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380"; 21 21 22 22 chosen { 23 23 bootargs = "console=ttyS0,115200 earlyprintk";
+1 -1
arch/arm/boot/dts/armada-385.dtsi
··· 16 16 17 17 / { 18 18 model = "Marvell Armada 385 family SoC"; 19 - compatible = "marvell,armada385", "marvell,armada38x"; 19 + compatible = "marvell,armada385", "marvell,armada380"; 20 20 21 21 cpus { 22 22 #address-cells = <1>;
+1 -1
arch/arm/boot/dts/armada-38x.dtsi
··· 20 20 21 21 / { 22 22 model = "Marvell Armada 38x family SoC"; 23 - compatible = "marvell,armada38x"; 23 + compatible = "marvell,armada380"; 24 24 25 25 aliases { 26 26 gpio0 = &gpio0;