[ar7] remove old 2.6.24 code

[openwrt/svn-archive/archive.git] / target / linux / ar7 / files / arch / mips / ar7 / setup.c

diff --git a/target/linux/ar7/files/arch/mips/ar7/setup.c b/target/linux/ar7/files/arch/mips/ar7/setup.c
index 4abc39f1dfcc36f918cf75ccd12e1edcef1b78c0..58e1528570c0ae7a1c9cc0131f2d505471b58032 100644 (file)
--- a/target/linux/ar7/files/arch/mips/ar7/setup.c
+++ b/target/linux/ar7/files/arch/mips/ar7/setup.c
@@ -1,8 +1,4 @@
 /*
- * $Id$
- * 
- * Copyright (C) 2006, 2007 OpenWrt.org
- * 
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
  *
@@ -19,39 +15,25 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  */
+#include <linux/version.h>
 #include <linux/init.h>
-#include <linux/sched.h>
 #include <linux/ioport.h>
-#include <linux/pci.h>
-#include <linux/tty.h>
 #include <linux/pm.h>
-#include <linux/serial_8250.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/serial_reg.h>
-
-#include <asm/cpu.h>
-#include <asm/irq.h>
-#include <asm/mips-boards/generic.h>
-#include <asm/mips-boards/prom.h>
-#include <asm/dma.h>
-#include <asm/time.h>
-#include <asm/traps.h>
-#include <asm/io.h>
+
 #include <asm/reboot.h>
-#include <asm/gdb-stub.h>
+#include <asm/time.h>
 #include <asm/ar7/ar7.h>
+#include <asm/ar7/prom.h>
 
-extern void ar7_time_init(void);
 static void ar7_machine_restart(char *command);
 static void ar7_machine_halt(void);
 static void ar7_machine_power_off(void);
 
 static void ar7_machine_restart(char *command)
 {
-       volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
-                                                  AR7_RESET_SOFTWARE, 1);
-       *softres_reg = 1;
+       u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
+                                         AR7_RESET_SOFTWARE, 1);
+       writel(1, softres_reg);
 }
 
 static void ar7_machine_halt(void)
@@ -61,9 +43,9 @@ static void ar7_machine_halt(void)
 
 static void ar7_machine_power_off(void)
 {
-        volatile u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
-       u32 power_state = *power_reg | (3 << 30);
-       *power_reg = power_state;
+       u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
+       u32 power_state = readl(power_reg) | (3 << 30);
+       writel(power_state, power_reg);
        ar7_machine_halt();
 }
 
@@ -101,7 +83,6 @@ void __init plat_mem_setup(void)
        _machine_restart = ar7_machine_restart;
        _machine_halt = ar7_machine_halt;
        pm_power_off = ar7_machine_power_off;
-       board_time_init = ar7_time_init;
        panic_timeout = 3;
 
        io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000);
@@ -109,7 +90,6 @@ void __init plat_mem_setup(void)
        set_io_port_base(io_base);
 
        prom_meminit();
-#warning FIXME: clock initialisation
        ar7_init_clocks();
 
        ioport_resource.start = 0;
@@ -117,7 +97,8 @@ void __init plat_mem_setup(void)
        iomem_resource.start  = 0;
        iomem_resource.end    = ~0;
 
-       printk("%s, ID: 0x%04x, Revision: 0x%02x\n", get_system_type(), 
+       printk(KERN_INFO "%s, ID: 0x%04x, Revision: 0x%02x\n",
+                                       get_system_type(),
                ar7_chip_id(), ar7_chip_rev());
 }