ramips: rt288x: don't register the PCI controller on each board

[openwrt.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 877d0b7..5f7cf14 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/common/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/setup.c
@@ -31,11 +31,12 @@ const char *get_system_type(void)
 static void __init detect_mem_size(void)
 {
        unsigned long size;
 static void __init detect_mem_size(void)
 {
        unsigned long size;

+       void *base;

 
 

+       base = (void *) KSEG1ADDR(detect_mem_size);

        for (size = RALINK_SOC_MEM_SIZE_MIN; size < RALINK_SOC_MEM_SIZE_MAX;
             size <<= 1 ) {
        for (size = RALINK_SOC_MEM_SIZE_MIN; size < RALINK_SOC_MEM_SIZE_MAX;
             size <<= 1 ) {

-               if (!memcmp(detect_mem_size,
-                           detect_mem_size + size, 1024))
+               if (!memcmp(base, base + size, 1024))

                        break;
        }
 
                        break;
        }
 


@@ -49,7 +50,7 @@ void __init ramips_early_serial_setup(int line, unsigned base, unsigned freq,
        int err;
 
        memset(&p, 0, sizeof(p));
        int err;
 
        memset(&p, 0, sizeof(p));

-       p.flags         = UPF_SKIP_TEST;
+       p.flags         = UPF_SKIP_TEST | UPF_FIXED_TYPE;

        p.iotype        = UPIO_AU;
        p.uartclk       = freq;
        p.regshift      = 2;
        p.iotype        = UPIO_AU;
        p.uartclk       = freq;
        p.regshift      = 2;