diff options
author | Pali Rohár <pali@kernel.org> | 2022-07-13 14:56:44 +0200 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@bootlin.com> | 2023-02-01 08:45:01 +0100 |
commit | 5a7363821281f981b3f6cb8e77d1868d092705c8 (patch) | |
tree | 858135ef553f9b64ed87b65f06c746d31ee8d2ba /arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | |
parent | 1b929c02afd37871d5afb9d498426f83432e71c2 (diff) | |
download | linux-next-5a7363821281f981b3f6cb8e77d1868d092705c8.tar.gz |
arm64: dts: marvell: Fix compatible strings for Armada 3720 boards
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>
Diffstat (limited to 'arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts')
-rw-r--r-- | arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts index cd0988317623..9eab2bb22134 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -14,7 +14,7 @@ / { model = "CZ.NIC Turris Mox Board"; compatible = "cznic,turris-mox", "marvell,armada3720", - "marvell,armada3710"; + "marvell,armada3700"; aliases { spi0 = &spi0; |