diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 18:01:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 18:01:29 -0400 |
commit | 7e2225d860772aaa07e1cebca6a5aa6f93f9aa91 (patch) | |
tree | 8a4c3076c2043d011fcf2357835f4f16be7606a7 /arch/mips/gt64120/wrppmc | |
parent | 3a628b0fd42f7eaf9d052447784d48ceae9ffb8e (diff) | |
parent | b27418aa551a153e8bf1bd16cf93e5786f9590a9 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (54 commits)
[MIPS] Remove mips_machtype for LASAT machines
[MIPS] Remove mips_machtype from EMMA2RH machines
[MIPS] Remove mips_machtype from ARC based machines
[MIPS] MTX-1 flash partition setup move to platform devices registration
[MIPS] TXx9: cleanup and fix some sparse warnings
[MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx
[MIPS] remove machtype for group Toshiba
[MIPS] separate rbtx4927_time_init() and rbtx4937_time_init()
[MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init()
[MIPS] txx9_cpu_clock setup move to rbtx4927_time_init()
[MIPS] txx9_board_vec set directly without mips_machtype
[MIPS] IP22: Add platform device for Indy volume buttons
[MIPS] cmbvr4133: Remove support
[MIPS] remove wrppmc_machine_power_off()
[MIPS] replace inline assembler to cpu_wait()
[MIPS] IP22/28: Add platform devices for HAL2
[MIPS] TXx9: Update and merge defconfigs
[MIPS] TXx9: Make single kernel can support multiple boards
[MIPS] TXx9: Update defconfigs
[MIPS] TXx9: Reorganize PCI code
...
Diffstat (limited to 'arch/mips/gt64120/wrppmc')
-rw-r--r-- | arch/mips/gt64120/wrppmc/reset.c | 14 | ||||
-rw-r--r-- | arch/mips/gt64120/wrppmc/setup.c | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/arch/mips/gt64120/wrppmc/reset.c b/arch/mips/gt64120/wrppmc/reset.c index c355cff38f6c..cc5474b24f06 100644 --- a/arch/mips/gt64120/wrppmc/reset.c +++ b/arch/mips/gt64120/wrppmc/reset.c | |||
@@ -5,10 +5,12 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 1997 Ralf Baechle | 6 | * Copyright (C) 1997 Ralf Baechle |
7 | */ | 7 | */ |
8 | #include <linux/irqflags.h> | ||
8 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
9 | 10 | ||
10 | #include <asm/cacheflush.h> | 11 | #include <asm/cacheflush.h> |
11 | #include <asm/mipsregs.h> | 12 | #include <asm/mipsregs.h> |
13 | #include <asm/processor.h> | ||
12 | 14 | ||
13 | void wrppmc_machine_restart(char *command) | 15 | void wrppmc_machine_restart(char *command) |
14 | { | 16 | { |
@@ -32,15 +34,7 @@ void wrppmc_machine_halt(void) | |||
32 | 34 | ||
33 | printk(KERN_NOTICE "You can safely turn off the power\n"); | 35 | printk(KERN_NOTICE "You can safely turn off the power\n"); |
34 | while (1) { | 36 | while (1) { |
35 | __asm__( | 37 | if (cpu_wait) |
36 | ".set\tmips3\n\t" | 38 | cpu_wait(); |
37 | "wait\n\t" | ||
38 | ".set\tmips0" | ||
39 | ); | ||
40 | } | 39 | } |
41 | } | 40 | } |
42 | |||
43 | void wrppmc_machine_power_off(void) | ||
44 | { | ||
45 | wrppmc_machine_halt(); | ||
46 | } | ||
diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c index 728ef6a80edd..ca65c84031a7 100644 --- a/arch/mips/gt64120/wrppmc/setup.c +++ b/arch/mips/gt64120/wrppmc/setup.c | |||
@@ -98,11 +98,10 @@ void __init plat_mem_setup(void) | |||
98 | { | 98 | { |
99 | extern void wrppmc_machine_restart(char *command); | 99 | extern void wrppmc_machine_restart(char *command); |
100 | extern void wrppmc_machine_halt(void); | 100 | extern void wrppmc_machine_halt(void); |
101 | extern void wrppmc_machine_power_off(void); | ||
102 | 101 | ||
103 | _machine_restart = wrppmc_machine_restart; | 102 | _machine_restart = wrppmc_machine_restart; |
104 | _machine_halt = wrppmc_machine_halt; | 103 | _machine_halt = wrppmc_machine_halt; |
105 | pm_power_off = wrppmc_machine_power_off; | 104 | pm_power_off = wrppmc_machine_halt; |
106 | 105 | ||
107 | /* This makes the operations of 'in/out[bwl]' to the | 106 | /* This makes the operations of 'in/out[bwl]' to the |
108 | * physical address ( < KSEG0) can work via KSEG1 | 107 | * physical address ( < KSEG0) can work via KSEG1 |