EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Style cleanup

Browse Source 
SVN-Revision: 8744
This commit is contained in:
Eugene Konev 2007-09-11 13:18:51 +00:00
parent 65235a2bb9
commit 7b30c695dd
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
target/linux/ar7/files/arch/mips/ar7/setup.c
View File

@ -1,8 +1,8 @@
/* /*
* $Id$ * $Id$
* *
* Copyright (C) 2006, 2007 OpenWrt.org * Copyright (C) 2006, 2007 OpenWrt.org
* *
* Carsten Langgaard, carstenl@mips.com * Carsten Langgaard, carstenl@mips.com
* Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
* *
@ -20,26 +20,12 @@
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/tty.h>
#include <linux/pm.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/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/reboot.h>
#include <asm/gdb-stub.h> #include <asm/time.h>
#include <asm/ar7/ar7.h> #include <asm/ar7/ar7.h>
extern void ar7_time_init(void); extern void ar7_time_init(void);
@ -49,9 +35,9 @@ static void ar7_machine_power_off(void);
static void ar7_machine_restart(char *command) static void ar7_machine_restart(char *command)
{ {
volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET + u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
AR7_RESET_SOFTWARE, 1); AR7_RESET_SOFTWARE, 1);
*softres_reg = 1; writel(1, softres_reg);
} }
static void ar7_machine_halt(void) static void ar7_machine_halt(void)
@ -61,9 +47,9 @@ static void ar7_machine_halt(void)
static void ar7_machine_power_off(void) static void ar7_machine_power_off(void)
{ {
volatile u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1); u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
u32 power_state = *power_reg | (3 << 30); u32 power_state = readl(power_reg) | (3 << 30);
*power_reg = power_state; writel(power_state, power_reg);
ar7_machine_halt(); ar7_machine_halt();
} }
@ -109,7 +95,6 @@ void __init plat_mem_setup(void)
set_io_port_base(io_base); set_io_port_base(io_base);
prom_meminit(); prom_meminit();
#warning FIXME: clock initialisation
ar7_init_clocks(); ar7_init_clocks();
ioport_resource.start = 0; ioport_resource.start = 0;