random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: armada-3720-espressobin: use Linux model/compatible strings

Browse Source 
Fix the actual board vendor and ease synching dts files from Linux.

Signed-off-by: Andre Heider <a.heider@gmail.com>
Reviewed-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Andre Heider 2020-10-02 07:51:12 +02:00 committed by Stefan Roese
parent 2df286390a
commit 559ae35c96
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/dts/armada-3720-espressobin.dts
View File

@ -50,8 +50,8 @@
#include "armada-372x.dtsi" #include "armada-372x.dtsi"
/ { / {
model = "Marvell Armada 3720 Community Board ESPRESSOBin"; model = "Globalscale Marvell ESPRESSOBin Board";
compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710"; compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
chosen { chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";

8
board/Marvell/mvebu_armada-37xx/board.c
View File

@ -88,14 +88,14 @@ int board_late_init(void)
if (env_get("fdtfile")) if (env_get("fdtfile"))
return 0; return 0;
if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) if (!of_machine_is_compatible("globalscale,espressobin"))
return 0; return 0;
/* If the memory controller has been configured for DDR4, we're running on v7 */ /* If the memory controller has been configured for DDR4, we're running on v7 */
ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS) ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4; & A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc"); emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
if (ddr4 && emmc) if (ddr4 && emmc)
env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb"); env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
@ -248,7 +248,7 @@ static int mii_multi_chip_mode_write(struct mii_dev *bus, int dev_smi_addr,
/* Bring-up board-specific network stuff */ /* Bring-up board-specific network stuff */
int board_network_enable(struct mii_dev *bus) int board_network_enable(struct mii_dev *bus)
{ {
if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) if (!of_machine_is_compatible("globalscale,espressobin"))
return 0; return 0;
/* /*
@ -300,7 +300,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
int part_off; int part_off;
/* Fill SPI MTD partitions for Linux kernel on Espressobin */ /* Fill SPI MTD partitions for Linux kernel on Espressobin */
if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) if (!of_machine_is_compatible("globalscale,espressobin"))
return 0; return 0;
spi_off = fdt_node_offset_by_compatible(blob, -1, "jedec,spi-nor"); spi_off = fdt_node_offset_by_compatible(blob, -1, "jedec,spi-nor");