diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-09-23 20:29:46 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-10-24 18:34:25 -0400 |
commit | 83bc769200802c9ce8fd1c7315fd14198d385b12 (patch) | |
tree | 5ad1e1704460f1bb03a6bfb13fdb2fa81ebc3279 /arch/mips/jz4740/pm.c | |
parent | 3766386037827fe7064f57f9aec27b3b5e9417aa (diff) |
MIPS: JZ4740: Use generic irq chip
Use the generic irq chip framework to implement the jz4740 INTC and GPIO irq
chips.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/2434/
Patchwork: https://patchwork.linux-mips.org/patch/2771/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/jz4740/pm.c')
-rw-r--r-- | arch/mips/jz4740/pm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/jz4740/pm.c b/arch/mips/jz4740/pm.c index 902d5b50124c..6744fa723f72 100644 --- a/arch/mips/jz4740/pm.c +++ b/arch/mips/jz4740/pm.c | |||
@@ -21,11 +21,9 @@ | |||
21 | #include <asm/mach-jz4740/clock.h> | 21 | #include <asm/mach-jz4740/clock.h> |
22 | 22 | ||
23 | #include "clock.h" | 23 | #include "clock.h" |
24 | #include "irq.h" | ||
25 | 24 | ||
26 | static int jz4740_pm_enter(suspend_state_t state) | 25 | static int jz4740_pm_enter(suspend_state_t state) |
27 | { | 26 | { |
28 | jz4740_intc_suspend(); | ||
29 | jz4740_clock_suspend(); | 27 | jz4740_clock_suspend(); |
30 | 28 | ||
31 | jz4740_clock_set_wait_mode(JZ4740_WAIT_MODE_SLEEP); | 29 | jz4740_clock_set_wait_mode(JZ4740_WAIT_MODE_SLEEP); |
@@ -37,7 +35,6 @@ static int jz4740_pm_enter(suspend_state_t state) | |||
37 | jz4740_clock_set_wait_mode(JZ4740_WAIT_MODE_IDLE); | 35 | jz4740_clock_set_wait_mode(JZ4740_WAIT_MODE_IDLE); |
38 | 36 | ||
39 | jz4740_clock_resume(); | 37 | jz4740_clock_resume(); |
40 | jz4740_intc_resume(); | ||
41 | 38 | ||
42 | return 0; | 39 | return 0; |
43 | } | 40 | } |