Commit 05e7511f authored by Andre Heider's avatar Andre Heider Committed by Stefan Roese
Browse files

arm: mvebu: Espressobin: Fix checks against machine compatible strings



The patches changing the compatible strings to the ones used by Linux have
not been merged yet, so fix the checks to use the current in-tree ones.
Reported-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarAndre Heider <a.heider@gmail.com>
Reviewed-by: default avatarPali Rohár <pali@kernel.org>
parent 3dee18e2
...@@ -88,14 +88,14 @@ int board_late_init(void) ...@@ -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("globalscale,espressobin")) if (!of_machine_is_compatible("marvell,armada-3720-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("globalscale,espressobin-emmc"); emmc = of_machine_is_compatible("marvell,armada-3720-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");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment