Skip to content

Commit

Permalink
MIPS: ath79: make use of the new memory detection code
Browse files Browse the repository at this point in the history
There is now a generic function for detecting memory size. Use this instead of
the one found in the ath79 support.

Signed-off-by: John Crispin <blogic@openwrt.org>
Acked-by: Gabor Juhos <juhosg@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5149/
  • Loading branch information
John Crispin authored and Ralf Baechle committed May 7, 2013
1 parent dd63b00 commit 9b75733
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions arch/mips/ath79/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,6 @@ static void ath79_halt(void)
cpu_wait();
}

static void __init ath79_detect_mem_size(void)
{
unsigned long size;

for (size = ATH79_MEM_SIZE_MIN; size < ATH79_MEM_SIZE_MAX;
size <<= 1) {
if (!memcmp(ath79_detect_mem_size,
ath79_detect_mem_size + size, 1024))
break;
}

add_memory_region(0, size, BOOT_MEM_RAM);
}

static void __init ath79_detect_sys_type(void)
{
char *chip = "????";
Expand Down Expand Up @@ -212,7 +198,7 @@ void __init plat_mem_setup(void)
AR71XX_DDR_CTRL_SIZE);

ath79_detect_sys_type();
ath79_detect_mem_size();
detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
ath79_clocks_init();

_machine_restart = ath79_restart;
Expand Down

0 comments on commit 9b75733

Please sign in to comment.