]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: mvebu: Espressobin: Fix checks against machine compatible strings
authorAndre Heider <a.heider@gmail.com>
Tue, 29 Sep 2020 12:34:26 +0000 (14:34 +0200)
committerStefan Roese <sr@denx.de>
Thu, 1 Oct 2020 08:43:43 +0000 (10:43 +0200)
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: Pali Rohár <pali@kernel.org>
Signed-off-by: Andre Heider <a.heider@gmail.com>
Reviewed-by: Pali Rohár <pali@kernel.org>
board/Marvell/mvebu_armada-37xx/board.c

index eacee15cb372159b71b297959555b01b571fd447..2bfc7171c4bb01490395531c1e870a34abd742c4 100644 (file)
@@ -88,14 +88,14 @@ int board_late_init(void)
        if (env_get("fdtfile"))
                return 0;
 
-       if (!of_machine_is_compatible("globalscale,espressobin"))
+       if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
                return 0;
 
        /* 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)
                & 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)
                env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");