ramips: replace RALINK_SOC_* macros with global variables

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / arch / mips / ralink / common / setup.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/common/setup.c b/target/linux/ramips/files/arch/mips/ralink/common/setup.c
index 86e951ca20bc26355878f0c3e8a3353761e6004f..0d6b8d8c90495cf253f477ddffe2d4b2fcffce8a 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/common/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/setup.c
@@ -12,25 +12,58 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/serial_8250.h>
 
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 
 #include <asm/mach-ralink/common.h>
-#include <ralink_soc.h>
+#include <asm/mach-ralink/machine.h>
+
+unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN];
+
+const char *get_system_type(void)
+{
+       return ramips_sys_type;
+}
 
 static void __init detect_mem_size(void)
 {
        unsigned long size;
+       void *base;
 
-       for (size = RALINK_SOC_MEM_SIZE_MIN; size < RALINK_SOC_MEM_SIZE_MAX;
+       base = (void *) KSEG1ADDR(detect_mem_size);
+       for (size = ramips_mem_size_min; size < ramips_mem_size_max;
             size <<= 1 ) {
-               if (!memcmp(detect_mem_size,
-                           detect_mem_size + size, 1024))
+               if (!memcmp(base, base + size, 1024))
                        break;
        }
 
-       add_memory_region(RALINK_SOC_SDRAM_BASE, size, BOOT_MEM_RAM);
+       add_memory_region(ramips_mem_base, size, BOOT_MEM_RAM);
+}
+
+void __init ramips_early_serial_setup(int line, unsigned base, unsigned freq,
+                                     unsigned irq)
+{
+       struct uart_port p;
+       int err;
+
+       memset(&p, 0, sizeof(p));
+       p.flags         = UPF_SKIP_TEST | UPF_FIXED_TYPE;
+       p.iotype        = UPIO_AU;
+       p.uartclk       = freq;
+       p.regshift      = 2;
+       p.type          = PORT_16550A;
+
+       p.mapbase       = base;
+       p.membase       = ioremap_nocache(p.mapbase, PAGE_SIZE);
+       p.line          = line;
+       p.irq           = irq;
+
+       err = early_serial_setup(&p);
+       if (err)
+               printk(KERN_ERR "early serial%d registration failed %d\n",
+                      line, err);
 }
 
 void __init plat_mem_setup(void)
@@ -40,3 +73,20 @@ void __init plat_mem_setup(void)
        detect_mem_size();
        ramips_soc_setup();
 }
+
+__setup("board=", mips_machtype_setup);
+
+static int __init ramips_machine_setup(void)
+{
+       mips_machine_setup();
+       return 0;
+}
+
+arch_initcall(ramips_machine_setup);
+
+static void __init ramips_generic_init(void)
+{
+}
+
+MIPS_MACHINE(RAMIPS_MACH_GENERIC, "Generic", "Generic Ralink board",
+            ramips_generic_init);