From: Paul Cercueil <paul@crapouillou.net>
Date: Thu, 30 Jul 2020 16:12:31 +0000 (+0200)
Subject: MIPS: ingenic: Use fw_passed_dtb even if CONFIG_BUILTIN_DTB
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=199c5f080ed695c4b01236e06743a28952403d17;p=linux.git

MIPS: ingenic: Use fw_passed_dtb even if CONFIG_BUILTIN_DTB

The fw_passed_dtb is now properly initialized even when
CONFIG_BUILTIN_DTB is used, so there's no need to handle it in any
particular way here.

Note that the behaviour is slightly different, as the previous code used
the built-in Device Tree unconditionally, while now the built-in Device
Tree is only used when the bootloader did not provide one.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
index fc49601c2b964..d73c9b722bf32 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -67,13 +67,8 @@ static unsigned long __init get_board_mach_type(const void *fdt)
 
 void __init plat_mem_setup(void)
 {
+	void *dtb = (void *)fw_passed_dtb;
 	int offset;
-	void *dtb;
-
-	if (__dtb_start != __dtb_end)
-		dtb = __dtb_start;
-	else
-		dtb = (void *)fw_passed_dtb;
 
 	__dt_setup_arch(dtb);