diff options
| author | Steven Miao <realmz6@gmail.com> | 2012-05-17 11:29:54 +0200 |
|---|---|---|
| committer | Bob Liu <lliubbo@gmail.com> | 2012-05-21 08:54:50 +0200 |
| commit | 0fbd88ca20a68a633b565e1f5ba18ca64afb0c78 (patch) | |
| tree | 0c97e9c20a71ba20750f4e51d8e0e4a07e845ddd /arch/blackfin/mach-common | |
| parent | blackfin: bf60x: make clock changeable in kernel menuconfig (diff) | |
| download | linux-0fbd88ca20a68a633b565e1f5ba18ca64afb0c78.tar.xz linux-0fbd88ca20a68a633b565e1f5ba18ca64afb0c78.zip | |
blackfin: bf60x: add wakeup source select
Support select the wakeup source for power management on bf60x.
Signed-off-by: Steven Miao <realmz6@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin/mach-common')
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 3 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/pm.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 1146a6152ae6..2729cba715b0 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c @@ -437,7 +437,7 @@ static void bfin_internal_unmask_irq_chip(struct irq_data *d) } #endif -#ifdef CONFIG_PM +#if defined(CONFIG_PM) && !defined(CONFIG_BF60x) int bfin_internal_set_wake(unsigned int irq, unsigned int state) { u32 bank, bit, wakeup = 0; @@ -496,6 +496,7 @@ static int bfin_internal_set_wake_chip(struct irq_data *d, unsigned int state) return bfin_internal_set_wake(d->irq, state); } #else +# define bfin_internal_set_wake(irq, state) # define bfin_internal_set_wake_chip NULL #endif diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index c25c2f1c819c..610a3cdf3998 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c @@ -153,9 +153,6 @@ int bfin_pm_suspend_mem_enter(void) #ifndef CONFIG_BF60x wakeup = bfin_read_VR_CTL() & ~FREQ; -#else - -#endif wakeup |= SCKELOW; #ifdef CONFIG_PM_BFIN_WAKE_PH6 @@ -164,6 +161,7 @@ int bfin_pm_suspend_mem_enter(void) #ifdef CONFIG_PM_BFIN_WAKE_GP wakeup |= GPWE; #endif +#endif ret = blackfin_dma_suspend(); |