Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit c6a26ce9af9eca685bdd766bcc1dbc855394880b

Authored by Steven Miao
1 parent 9a3c4145af
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

pm: bf609: cleanup smc nor flash 

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>

Showing 3 changed files with 5 additions and 7 deletions Side-by-side Diff

arch/blackfin/mach-bf609/boards/ezkit.c
Diff comments   View file @ c6a26ce
... ... @@ -698,8 +698,6 @@
698 698 {
699 699 #define CONFIG_SMC_GCTL_VAL 0x00000010
700 700  
701   - if (!devm_pinctrl_get_select_default(&pdev->dev))
702   - return -EBUSY;
703 701 bfin_write32(SMC_GCTL, CONFIG_SMC_GCTL_VAL);
704 702 bfin_write32(SMC_B0CTL, 0x01002011);
705 703 bfin_write32(SMC_B0TIM, 0x08170977);
... ... @@ -709,7 +707,6 @@
709 707  
710 708 void bf609_nor_flash_exit(struct platform_device *pdev)
711 709 {
712   - devm_pinctrl_put(pdev->dev.pins->p);
713 710 bfin_write32(SMC_GCTL, 0);
714 711 }
715 712  
arch/blackfin/mach-bf609/include/mach/pm.h
Diff comments   View file @ c6a26ce
... ... @@ -10,6 +10,7 @@
10 10 #define __MACH_BF609_PM_H__
11 11  
12 12 #include <linux/suspend.h>
  13 +#include <linux/platform_device.h>
13 14  
14 15 extern int bfin609_pm_enter(suspend_state_t state);
15 16 extern int bf609_pm_prepare(void);
... ... @@ -19,7 +20,7 @@
19 20 void bfin_sec_raise_irq(unsigned int sid);
20 21 void coreb_enable(void);
21 22  
22   -int bf609_nor_flash_init(void);
23   -void bf609_nor_flash_exit(void);
  23 +int bf609_nor_flash_init(struct platform_device *pdev);
  24 +void bf609_nor_flash_exit(struct platform_device *pdev);
24 25 #endif
arch/blackfin/mach-bf609/pm.c
Diff comments   View file @ c6a26ce
... ... @@ -291,13 +291,13 @@
291 291 #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
292 292 static int smc_pm_syscore_suspend(void)
293 293 {
294   - bf609_nor_flash_exit();
  294 + bf609_nor_flash_exit(NULL);
295 295 return 0;
296 296 }
297 297  
298 298 static void smc_pm_syscore_resume(void)
299 299 {
300   - bf609_nor_flash_init();
  300 + bf609_nor_flash_init(NULL);
301 301 }
302 302  
303 303 static struct syscore_ops smc_pm_syscore_ops = {