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 f23592223aef68045fc1aa06cddc3955a7ef04bc..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,7 +21,6 @@
 #include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/pci.h>
 
 #include "machtype.h"
 #include "devices.h"
@@ -65,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;
@@ -108,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;
@@ -212,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;
 
@@ -288,3 +300,11 @@ static int __init ar71xx_machine_setup(void)
 }
 
 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);