Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 15205fc0 authored by Paul Cercueil's avatar Paul Cercueil Committed by Paul Burton
Browse files

MIPS: ingenic: Add support for appended devicetree 



Add support for booting the kernel from an externally-appended
devicetree, if no devicetree was built-in.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent 69a07a41

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ config MACH_INGENIC 
	select GPIOLIB

	select COMMON_CLK

	select GENERIC_IRQ_CHIP

	select BUILTIN_DTB

	select BUILTIN_DTB if MIPS_NO_APPENDED_DTB

	select USE_OF

	select LIBFDT

arch/mips/jz4740/setup.c

+10 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


#define JZ4740_EMC_SDRAM_CTRL 0x80





static void __init jz4740_detect_mem(void)

{

	void __iomem *jz_emc_base;
@@ -66,15 +65,22 @@ static unsigned long __init get_board_mach_type(const void *fdt) 
void __init plat_mem_setup(void)

{

	int offset;

	void *dtb;



	jz4740_reset_init();

	__dt_setup_arch(__dtb_start);



	offset = fdt_path_offset(__dtb_start, "/memory");

	if (__dtb_start != __dtb_end)

		dtb = __dtb_start;

	else

		dtb = (void *)fw_passed_dtb;



	__dt_setup_arch(dtb);



	offset = fdt_path_offset(dtb, "/memory");

	if (offset < 0)

		jz4740_detect_mem();



	mips_machtype = get_board_mach_type(__dtb_start);

	mips_machtype = get_board_mach_type(dtb);

}



void __init device_tree_init(void)