ramips: add Kbuild patch for the rt288x pci code, and fix invalid header file paths

[openwrt.git] / 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 d025852..e2328fe 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
@@ -14,21 +14,15 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #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/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>
 
 #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);
 static void rt288x_restart(char *command)
 {
        rt288x_sysc_wr(RT2880_RESET_SYSTEM, SYSC_REG_RESET_CTRL);


@@ -43,75 +37,20 @@ static void rt288x_halt(void)
                cpu_wait();
 }
 
                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;
-       int err;
-
-       memset(&p, 0, sizeof(p));
-       p.flags         = UPF_SKIP_TEST;
-       p.iotype        = UPIO_AU;
-       p.uartclk       = rt288x_sys_freq;
-       p.regshift      = 2;
-       p.type          = PORT_16550A;
-
-       p.mapbase       = RT2880_UART0_BASE;
-       p.membase       = ioremap_nocache(p.mapbase, RT2880_UART0_SIZE);
-       p.line          = 0;
-       p.irq           = RT2880_INTC_IRQ_UART0;
-
-       err = early_serial_setup(&p);
-       if (err)
-               printk(KERN_ERR "RT288x: early UART0 registration failed %d\n",
-                       err);
-
-       p.mapbase       = RT2880_UART1_BASE;
-       p.membase       = ioremap_nocache(p.mapbase, RT2880_UART1_SIZE);
-       p.line          = 1;
-       p.irq           = RT2880_INTC_IRQ_UART1;
-
-       err = early_serial_setup(&p);
-       if (err)
-               printk(KERN_ERR "RT288x: early UART1 registration failed %d\n",
-                       err);
-}
-
-const char *get_system_type(void)
-{
-       return rt288x_sys_type;
-}
-

 unsigned int __cpuinit get_c0_compare_irq(void)
 {
        return CP0_LEGACY_COMPARE_IRQ;
 }
 
 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_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();
 
        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);
 
                rt288x_cpu_freq / 1000000,
                (rt288x_cpu_freq % 1000000) * 100 / 1000000);
 


@@ -119,19 +58,13 @@ void __init plat_mem_setup(void)
        _machine_halt = rt288x_halt;
        pm_power_off = rt288x_halt;
 
        _machine_halt = rt288x_halt;
        pm_power_off = rt288x_halt;
 

-       rt288x_early_serial_setup();
+       ramips_early_serial_setup(0, RT2880_UART0_BASE, rt288x_sys_freq,
+                                 RT2880_INTC_IRQ_UART0);
+       ramips_early_serial_setup(1, RT2880_UART1_BASE, rt288x_sys_freq,
+                                 RT2880_INTC_IRQ_UART1);

 }
 
 void __init plat_time_init(void)
 {
        mips_hpt_frequency = rt288x_cpu_freq / 2;
 }
 }
 
 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);