Unverified Commit 3e47c0df authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-6.3-1' of... 

Merge tag 'mvebu-dt64-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt

mvebu dt64 for 6.3 (part 1)

Do not use anymore "marvell,armada3710" compatible string for the
Armada 3720 boards.

* tag 'mvebu-dt64-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: marvell: Fix compatible strings for Armada 3720 boards

Link: https://lore.kernel.org/r/87zg9w9j6l.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents df5bc88f 5a736382

arch/arm64/boot/dts/marvell/armada-3720-db.dts

+1 −1
Original line number Diff line number Diff line
@@ -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";

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {

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

+1 −1
Original line number Diff line number Diff line
@@ -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 */

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

+1 −1
Original line number Diff line number Diff line
@@ -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 */

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

+1 −1
Original line number Diff line number Diff line
@@ -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 */