Skip to content

Commit

Permalink
MIPS: JZ4740: only detect RAM size if not specified in DT
Browse files Browse the repository at this point in the history
Allow a devicetree to specify the memory present in the system rather
than probing it from the memory controller. This both saves the probing
for systems where the amount of memory is fixed, and will simplify the
bringup of later Ingenic SoCs where the memory controller register
layout differs.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10163/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Paul Burton authored and Ralf Baechle committed Jun 21, 2015
1 parent 1237496 commit 6ec127f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions arch/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ config MACH_INGENIC
select GENERIC_IRQ_CHIP
select BUILTIN_DTB
select USE_OF
select LIBFDT

config LANTIQ
bool "Lantiq based platforms"
Expand Down
2 changes: 2 additions & 0 deletions arch/mips/jz4740/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
obj-y += prom.o time.o reset.o setup.o \
gpio.o platform.o timer.o serial.o

CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt

# board specific support

obj-$(CONFIG_JZ4740_QI_LB60) += board-qi_lb60.o
Expand Down
8 changes: 7 additions & 1 deletion arch/mips/jz4740/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/io.h>
#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/libfdt.h>
#include <linux/of_fdt.h>
#include <linux/of_platform.h>

Expand Down Expand Up @@ -55,9 +56,14 @@ static void __init jz4740_detect_mem(void)

void __init plat_mem_setup(void)
{
int offset;

jz4740_reset_init();
jz4740_detect_mem();
__dt_setup_arch(__dtb_start);

offset = fdt_path_offset(__dtb_start, "/memory");
if (offset < 0)
jz4740_detect_mem();
}

void __init device_tree_init(void)
Expand Down

0 comments on commit 6ec127f

Please sign in to comment.