add feature gpio

[lede.git] / target / linux / ramips / files / arch / mips / ralink / common / prom.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/common/prom.c b/target/linux/ramips/files/arch/mips/ralink/common/prom.c
index 5dad9c28fbbde52a4165c25d4b0ed2788448f21b..26169d366df430998032e23031df8efd2e73e786 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/common/prom.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/prom.c
@@ -1,6 +1,7 @@
 /*
  *  Ralink SoC specific prom routines
  *
+ *  Copyright (C) 2010 Joonas Lahtinen <joonas.lahtinen@gmail.com>
  *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -17,62 +18,41 @@
 
 #include <asm/mach-ralink/common.h>
 #include <asm/mach-ralink/machine.h>
-#include <ralink_soc.h>
-
-struct board_rec {
-       char                    *name;
-       enum ramips_mach_type   mach_type;
-};
-
-static struct board_rec boards[] __initdata = {
-       {
-               .name           = "RT-N15",
-               .mach_type      = RAMIPS_MACH_RT_N15,
-       }, {
-               .name           = "DIR-300-revB",
-               .mach_type      = RAMIPS_MACH_DIR_300_REVB,
-       }, {
-               .name           = "V22RW-2X2",
-               .mach_type      = RAMIPS_MACH_V22RW_2X2,
-       }, {
-               .name           = "WHR-G300N",
-               .mach_type      = RAMIPS_MACH_WHR_G300N,
-       }, {
-               .name           = "FONERA20N",
-               .mach_type      = RAMIPS_MACH_FONERA20N,
-       }
-};
+
+unsigned long ramips_mem_base;
+unsigned long ramips_mem_size_min;
+unsigned long ramips_mem_size_max;
 
 static inline void *to_ram_addr(void *addr)
 {
        u32 base;
 
-       base = KSEG0ADDR(RALINK_SOC_SDRAM_BASE);
+       base = KSEG0ADDR(ramips_mem_base);
        if (((u32) addr > base) &&
-           ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
+           ((u32) addr < (base + ramips_mem_size_max)))
                return addr;
 
-       base = KSEG1ADDR(RALINK_SOC_SDRAM_BASE);
+       base = KSEG1ADDR(ramips_mem_base);
        if (((u32) addr > base) &&
-           ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
+           ((u32) addr < (base + ramips_mem_size_max)))
                return addr;
 
        /* some U-Boot variants uses physical addresses */
-       base = RALINK_SOC_SDRAM_BASE;
+       base = ramips_mem_base;
        if (((u32) addr > base) &&
-           ((u32) addr < (base + RALINK_SOC_MEM_SIZE_MAX)))
+           ((u32) addr < (base + ramips_mem_size_max)))
                return (void *)KSEG0ADDR(addr);
 
        return NULL;
 }
 
+static char ramips_cmdline_buf[COMMAND_LINE_SIZE] __initdata;
 static void __init prom_append_cmdline(const char *name,
                                       const char *value)
 {
-       char buf[CL_SIZE];
-
-       snprintf(buf, sizeof(buf), " %s=%s", name, value);
-       strlcat(arcs_cmdline, buf, sizeof(arcs_cmdline));
+       snprintf(ramips_cmdline_buf, sizeof(ramips_cmdline_buf),
+                " %s=%s", name, value);
+       strlcat(arcs_cmdline, ramips_cmdline_buf, sizeof(arcs_cmdline));
 }
 
 #ifdef CONFIG_IMAGE_CMDLINE_HACK
@@ -160,26 +140,14 @@ static __init char *prom_append_env(char **env, const char *envname)
 #undef PROM_MAX_ENVS
 }
 
-static __init int ramips_board_setup(char *name)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(boards); i++)
-               if (strcmp(name, boards[i].name) == 0) {
-                       ramips_mach = boards[i].mach_type;
-                       break;
-               }
-
-       return 1;
-}
-__setup("board=", ramips_board_setup);
-
 void __init prom_init(void)
 {
        int argc;
        char **envp;
        char **argv;
 
+       ramips_soc_prom_init();
+
        printk(KERN_DEBUG
               "prom: fw_arg0=%08x, fw_arg1=%08x, fw_arg2=%08x, fw_arg3=%08x\n",
               (unsigned int)fw_arg0, (unsigned int)fw_arg1,