diff options
| author | Steven Miao <realmz6@gmail.com> | 2012-06-07 14:17:12 +0800 |
|---|---|---|
| committer | Bob Liu <lliubbo@gmail.com> | 2012-07-24 13:39:50 +0800 |
| commit | 923680cbee19bf7be11c3ec3ad6e5c14c4aa2194 (patch) | |
| tree | 5bbef34c76134c285b9ce1ecd1fecf2d76232ccb | |
| parent | 5f78028b1a1764cbd479092f568efe17a18af26f (diff) | |
| download | linux-3.10-923680cbee19bf7be11c3ec3ad6e5c14c4aa2194.tar.gz linux-3.10-923680cbee19bf7be11c3ec3ad6e5c14c4aa2194.tar.bz2 linux-3.10-923680cbee19bf7be11c3ec3ad6e5c14c4aa2194.zip | |
bf60x: pm: add smc nor flash syscore ops
Signed-off-by: Steven Miao <realmz6@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
| -rw-r--r-- | arch/blackfin/mach-bf609/include/mach/pm.h | 3 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf609/pm.c | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf609/include/mach/pm.h b/arch/blackfin/mach-bf609/include/mach/pm.h index 68435f9bafc..3ca0fb96563 100644 --- a/arch/blackfin/mach-bf609/include/mach/pm.h +++ b/arch/blackfin/mach-bf609/include/mach/pm.h @@ -18,4 +18,7 @@ extern void bf609_pm_finish(void); void bf609_hibernate(void); void bfin_sec_raise_irq(unsigned int sid); void coreb_enable(void); + +int bf609_nor_flash_init(void); +void bf609_nor_flash_exit(void); #endif diff --git a/arch/blackfin/mach-bf609/pm.c b/arch/blackfin/mach-bf609/pm.c index 6094c7d3b1f..4f697776263 100644 --- a/arch/blackfin/mach-bf609/pm.c +++ b/arch/blackfin/mach-bf609/pm.c @@ -11,8 +11,8 @@ #include <linux/interrupt.h> #include <linux/gpio.h> #include <linux/irq.h> - #include <linux/delay.h> +#include <linux/syscore_ops.h> #include <asm/dpmc.h> #include <asm/pm.h> @@ -293,6 +293,23 @@ static struct bfin_cpu_pm_fns bf609_cpu_pm = { .finish = bf609_cpu_pm_finish, }; +#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) +static void smc_pm_syscore_suspend(void) +{ + bf609_nor_flash_exit(); +} + +static void smc_pm_syscore_resume(void) +{ + bf609_nor_flash_init(); +} + +static struct syscore_ops smc_pm_syscore_ops = { + .suspend = smc_pm_syscore_suspend, + .resume = smc_pm_syscore_resume, +}; +#endif + static irqreturn_t test_isr(int irq, void *dev_id) { printk(KERN_DEBUG "gpio irq %d\n", irq); @@ -312,6 +329,10 @@ static int __init bf609_init_pm(void) int irq; int error; +#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) + register_syscore_ops(&smc_pm_syscore_ops); +#endif + #ifdef CONFIG_PM_BFIN_WAKE_PE12 irq = gpio_to_irq(GPIO_PE12); if (irq < 0) { |