ar71xx: fix whitespaces nits

[oweals/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / setup.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
index 1666d8216ba6c3afd8137858168386183e75d240..658fdd023e131adf1fe55633cfa3894a5f39c7a6 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
@@ -13,7 +13,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/serial_8250.h>
 #include <linux/bootmem.h>
 
 #include <asm/bootinfo.h>
@@ -22,8 +21,8 @@
 #include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/pci.h>
 
+#include "machtype.h"
 #include "devices.h"
 
 #define AR71XX_SYS_TYPE_LEN    64
@@ -31,8 +30,6 @@
 #define AR91XX_BASE_FREQ       5000000
 #define AR724X_BASE_FREQ       5000000
 
-enum ar71xx_mach_type ar71xx_mach;
-
 u32 ar71xx_cpu_freq;
 EXPORT_SYMBOL_GPL(ar71xx_cpu_freq);
 
@@ -66,7 +63,7 @@ static void __init ar71xx_detect_mem_size(void)
        unsigned long size;
 
        for (size = AR71XX_MEM_SIZE_MIN; size < AR71XX_MEM_SIZE_MAX;
-            size <<= 1 ) {
+            size <<= 1) {
                if (!memcmp(ar71xx_detect_mem_size,
                            ar71xx_detect_mem_size + size, 1024))
                        break;
@@ -109,12 +106,24 @@ static void __init ar71xx_detect_sys_type(void)
                }
                break;
 
-       case REV_ID_MAJOR_AR724X:
+       case REV_ID_MAJOR_AR7240:
                ar71xx_soc = AR71XX_SOC_AR7240;
                chip = "7240";
                rev = (id & AR724X_REV_ID_REVISION_MASK);
                break;
 
+       case REV_ID_MAJOR_AR7241:
+               ar71xx_soc = AR71XX_SOC_AR7241;
+               chip = "7241";
+               rev = (id & AR724X_REV_ID_REVISION_MASK);
+               break;
+
+       case REV_ID_MAJOR_AR7242:
+               ar71xx_soc = AR71XX_SOC_AR7242;
+               chip = "7242";
+               rev = (id & AR724X_REV_ID_REVISION_MASK);
+               break;
+
        case REV_ID_MAJOR_AR913X:
                minor = id & AR91XX_REV_ID_MINOR_MASK;
                rev = id >> AR91XX_REV_ID_REVISION_SHIFT;
@@ -213,6 +222,8 @@ static void __init detect_sys_frequency(void)
                break;
 
        case AR71XX_SOC_AR7240:
+       case AR71XX_SOC_AR7241:
+       case AR71XX_SOC_AR7242:
                ar724x_detect_sys_frequency();
                break;
 
@@ -226,26 +237,6 @@ static void __init detect_sys_frequency(void)
        }
 }
 
-#ifdef CONFIG_AR71XX_EARLY_SERIAL
-static void __init ar71xx_early_serial_setup(void)
-{
-       struct uart_port p;
-
-       memset(&p, 0, sizeof(p));
-
-       p.flags         = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP;
-       p.iotype        = UPIO_MEM32;
-       p.uartclk       = ar71xx_ahb_freq;
-       p.irq           = AR71XX_MISC_IRQ_UART;
-       p.regshift      = 2;
-       p.mapbase       = AR71XX_UART_BASE;
-
-       early_serial_setup(&p);
-}
-#else
-static inline void ar71xx_early_serial_setup(void) {};
-#endif /* CONFIG_AR71XX_EARLY_SERIAL */
-
 const char *get_system_type(void)
 {
        return ar71xx_sys_type;
@@ -288,8 +279,6 @@ void __init plat_mem_setup(void)
        _machine_restart = ar71xx_restart;
        _machine_halt = ar71xx_halt;
        pm_power_off = ar71xx_halt;
-
-       ar71xx_early_serial_setup();
 }
 
 void __init plat_time_init(void)
@@ -297,6 +286,8 @@ void __init plat_time_init(void)
        mips_hpt_frequency = ar71xx_cpu_freq / 2;
 }
 
+__setup("board=", mips_machtype_setup);
+
 static int __init ar71xx_machine_setup(void)
 {
        ar71xx_gpio_init();
@@ -304,8 +295,16 @@ static int __init ar71xx_machine_setup(void)
        ar71xx_add_device_uart();
        ar71xx_add_device_wdt();
 
-       mips_machine_setup(ar71xx_mach);
+       mips_machine_setup();
        return 0;
 }
 
 arch_initcall(ar71xx_machine_setup);
+
+static void __init ar71xx_generic_init(void)
+{
+       /* Nothing to do */
+}
+
+MIPS_MACHINE(AR71XX_MACH_GENERIC, "Generic", "Generic AR71xx board",
+            ar71xx_generic_init);