xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pm: bf609: cleanup smc nor flash

Browse Source 
drop smc pin state change code, pin state will be saved in pinctrl-adi2 driver
cleanup nor flash init/exit for pm suspend/resume

Signed-off-by: Steven Miao <realmz6@gmail.com>
This commit is contained in:
Steven Miao
2014-07-16 14:23:08 +08:00
parent 9a3c4145af
commit c6a26ce9af
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/blackfin/mach-bf609/boards/ezkit.c
View File

@@ -698,8 +698,6 @@ int bf609_nor_flash_init(struct platform_device *pdev)
{ {
#define CONFIG_SMC_GCTL_VAL 0x00000010 #define CONFIG_SMC_GCTL_VAL 0x00000010
if (!devm_pinctrl_get_select_default(&pdev->dev))
return -EBUSY;
bfin_write32(SMC_GCTL, CONFIG_SMC_GCTL_VAL); bfin_write32(SMC_GCTL, CONFIG_SMC_GCTL_VAL);
bfin_write32(SMC_B0CTL, 0x01002011); bfin_write32(SMC_B0CTL, 0x01002011);
bfin_write32(SMC_B0TIM, 0x08170977); bfin_write32(SMC_B0TIM, 0x08170977);
@@ -709,7 +707,6 @@ int bf609_nor_flash_init(struct platform_device *pdev)
void bf609_nor_flash_exit(struct platform_device *pdev) void bf609_nor_flash_exit(struct platform_device *pdev)
{ {
devm_pinctrl_put(pdev->dev.pins->p);
bfin_write32(SMC_GCTL, 0); bfin_write32(SMC_GCTL, 0);
} }

5
arch/blackfin/mach-bf609/include/mach/pm.h
View File

@@ -10,6 +10,7 @@
#define __MACH_BF609_PM_H__ #define __MACH_BF609_PM_H__
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/platform_device.h>
extern int bfin609_pm_enter(suspend_state_t state); extern int bfin609_pm_enter(suspend_state_t state);
extern int bf609_pm_prepare(void); extern int bf609_pm_prepare(void);
@@ -19,6 +20,6 @@ void bf609_hibernate(void);
void bfin_sec_raise_irq(unsigned int sid); void bfin_sec_raise_irq(unsigned int sid);
void coreb_enable(void); void coreb_enable(void);
int bf609_nor_flash_init(void); int bf609_nor_flash_init(struct platform_device *pdev);
void bf609_nor_flash_exit(void); void bf609_nor_flash_exit(struct platform_device *pdev);
#endif #endif

4
arch/blackfin/mach-bf609/pm.c
View File

@@ -291,13 +291,13 @@ static struct bfin_cpu_pm_fns bf609_cpu_pm = {
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
static int smc_pm_syscore_suspend(void) static int smc_pm_syscore_suspend(void)
{ {
bf609_nor_flash_exit(); bf609_nor_flash_exit(NULL);
return 0; return 0;
} }
static void smc_pm_syscore_resume(void) static void smc_pm_syscore_resume(void)
{ {
bf609_nor_flash_init(); bf609_nor_flash_init(NULL);
} }
static struct syscore_ops smc_pm_syscore_ops = { static struct syscore_ops smc_pm_syscore_ops = {