[PATCH] arm: mvebu: Espressobin: Fix checks against machine compatible strings

[Stefan Roese]

On 29.09.20 14:34, Andre Heider wrote:
> 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 at kernel.org>
> Signed-off-by: Andre Heider <a.heider at gmail.com>

Applied to u-boot-marvell/master

Thanks,
Stefan


> ---
>   board/Marvell/mvebu_armada-37xx/board.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
> index eacee15cb3..2bfc7171c4 100644
> --- a/board/Marvell/mvebu_armada-37xx/board.c
> +++ b/board/Marvell/mvebu_armada-37xx/board.c
> @@ -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");
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de