github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 00:22:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

Browse Source 
All Armada 3720 boards have Armada 3720 processor which is of Armada 3700
family and do not have Armada 3710 processor. So none of them should have
compatible string for Armada 3710 processor.

Fix compatible string for all these boards by removing wrong processor
string "marvell,armada3710" and adding family string "marvell,armada3700"
as the last one. (Note that this is same way how are defined Armada 3710
DTS files).
[gclement: fix conflict for v6.2]
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
This commit is contained in:
Pali Rohár 2022-07-13 14:56:44 +02:00 committed by Gregory CLEMENT
parent 1b929c02af
commit 5a73638212
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/marvell/armada-3720-db.dts
View File

@ -18,7 +18,7 @@
/ {
model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3";
compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710";
compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700";
chosen {
stdout-path = "serial0:115200n8";

2
arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
View File

@ -18,7 +18,7 @@
/ {
model = "Globalscale Marvell ESPRESSOBin Board (eMMC)";
compatible = "globalscale,espressobin-emmc", "globalscale,espressobin",
"marvell,armada3720", "marvell,armada3710";
"marvell,armada3720", "marvell,armada3700";
};
&sdhci0 {

2
arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
View File

@ -13,7 +13,7 @@
/ {
model = "Globalscale Marvell ESPRESSOBin Ultra Board";
compatible = "globalscale,espressobin-ultra", "globalscale,espressobin",
"marvell,armada3720", "marvell,armada3710";
"marvell,armada3720", "marvell,armada3700";
aliases {
/* ethernet1 is WAN port */

2
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
View File

@ -19,7 +19,7 @@ / {
model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)";
compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7",
"globalscale,espressobin", "marvell,armada3720",
"marvell,armada3710";
"marvell,armada3700";
aliases {
/* ethernet1 is wan port */

2
arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
View File

@ -18,7 +18,7 @@
/ {
model = "Globalscale Marvell ESPRESSOBin Board V7";
compatible = "globalscale,espressobin-v7", "globalscale,espressobin",
"marvell,armada3720", "marvell,armada3710";
"marvell,armada3720", "marvell,armada3700";
aliases {
/* ethernet1 is wan port */

2
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
View File

@ -16,5 +16,5 @@
/ {
model = "Globalscale Marvell ESPRESSOBin Board";
compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
};

2
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
View File

@ -14,7 +14,7 @@
/ {
model = "CZ.NIC Turris Mox Board";
compatible = "cznic,turris-mox", "marvell,armada3720",
"marvell,armada3710";
"marvell,armada3700";
aliases {
spi0 = &spi0;

2
arch/arm64/boot/dts/marvell/armada-372x.dtsi
View File

@ -13,7 +13,7 @@
/ {
model = "Marvell Armada 3720 SoC";
compatible = "marvell,armada3720", "marvell,armada3710";
compatible = "marvell,armada3720", "marvell,armada3700";
cpus {
cpu1: cpu@1 {