X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/69d56315efc39ca12491119db67f1e2033cd26cc..37bd623236d675677af55ff52ac5848cb51b672f:/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
index d0258524c..8dc4b3c32 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
@@ -16,19 +16,14 @@
 #include <linux/io.h>
 #include <linux/serial_8250.h>
 
-#include <asm/bootinfo.h>
 #include <asm/mips_machine.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
 
+#include <asm/mach-ralink/common.h>
 #include <asm/mach-ralink/rt288x.h>
 #include <asm/mach-ralink/rt288x_regs.h>
 
-#define RT288X_MEM_SIZE_MIN (2 * 1024 * 1024)
-#define RT288X_MEM_SIZE_MAX (128 * 1024 * 1024)
-
-unsigned long rt288x_mach_type;
-
 static void rt288x_restart(char *command)
 {
 	rt288x_sysc_wr(RT2880_RESET_SYSTEM, SYSC_REG_RESET_CTRL);
@@ -43,20 +38,6 @@ static void rt288x_halt(void)
 		cpu_wait();
 }
 
-static void __init rt288x_detect_mem_size(void)
-{
-	unsigned long size;
-
-	for (size = RT288X_MEM_SIZE_MIN; size < RT288X_MEM_SIZE_MAX;
-	     size <<= 1 ) {
-		if (!memcmp(rt288x_detect_mem_size,
-			    rt288x_detect_mem_size + size, 1024))
-			break;
-	}
-
-	add_memory_region(RT2880_SDRAM_BASE, size, BOOT_MEM_RAM);
-}
-
 static void __init rt288x_early_serial_setup(void)
 {
 	struct uart_port p;
@@ -90,28 +71,20 @@ static void __init rt288x_early_serial_setup(void)
 			err);
 }
 
-const char *get_system_type(void)
-{
-	return rt288x_sys_type;
-}
-
 unsigned int __cpuinit get_c0_compare_irq(void)
 {
 	return CP0_LEGACY_COMPARE_IRQ;
 }
 
-void __init plat_mem_setup(void)
+void __init ramips_soc_setup(void)
 {
-	set_io_port_base(KSEG1);
-
 	rt288x_sysc_base = ioremap_nocache(RT2880_SYSC_BASE, RT2880_SYSC_SIZE);
 	rt288x_memc_base = ioremap_nocache(RT2880_MEMC_BASE, RT2880_MEMC_SIZE);
 
-	rt288x_detect_mem_size();
 	rt288x_detect_sys_type();
 	rt288x_detect_sys_freq();
 
-	printk(KERN_INFO "%s running at %lu.%02lu MHz\n", get_system_type(),
+	printk(KERN_INFO "%s running at %lu.%02lu MHz\n", ramips_sys_type,
 		rt288x_cpu_freq / 1000000,
 		(rt288x_cpu_freq % 1000000) * 100 / 1000000);
 
@@ -126,12 +99,3 @@ void __init plat_time_init(void)
 {
 	mips_hpt_frequency = rt288x_cpu_freq / 2;
 }
-
-static int __init rt288x_machine_setup(void)
-{
-	mips_machine_setup(rt288x_mach_type);
-
-	return 0;
-}
-
-arch_initcall(rt288x_machine_setup);