diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-04-28 05:15:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:38 -0400 |
commit | cf19a37e0641d975d271a5a30f097dd6b96d232f (patch) | |
tree | bc5876359c353ac5f072cb9858d8dd4e5db731f7 | |
parent | 01d3a5e7fab7732cfc5d5d4533e9378ea435295a (diff) |
atmel_lcdfb: suspend/resume support
Teach atmel_lcdfb driver how to suspend/resume.
Note that the backlight control should probably do more of the same stuff:
turning off display power (more than just the backlight) and stopping the
clocks (and dma to drive the no-longer-seen display). No point in wasting
power to generate images that can't be observed, after all...
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Andrew Victor <avictor.za@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/atmel_lcdfb.c | 36 | ||||
-rw-r--r-- | include/video/atmel_lcdc.h | 1 |
2 files changed, 35 insertions, 2 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 4d68b1b880d..6fcf76c1291 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
@@ -909,10 +909,42 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev) | |||
909 | return 0; | 909 | return 0; |
910 | } | 910 | } |
911 | 911 | ||
912 | #ifdef CONFIG_PM | ||
913 | |||
914 | static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg) | ||
915 | { | ||
916 | struct fb_info *info = platform_get_drvdata(pdev); | ||
917 | struct atmel_lcdfb_info *sinfo = info->par; | ||
918 | |||
919 | sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); | ||
920 | lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0); | ||
921 | if (sinfo->atmel_lcdfb_power_control) | ||
922 | sinfo->atmel_lcdfb_power_control(0); | ||
923 | atmel_lcdfb_stop_clock(sinfo); | ||
924 | return 0; | ||
925 | } | ||
926 | |||
927 | static int atmel_lcdfb_resume(struct platform_device *pdev) | ||
928 | { | ||
929 | struct fb_info *info = platform_get_drvdata(pdev); | ||
930 | struct atmel_lcdfb_info *sinfo = info->par; | ||
931 | |||
932 | atmel_lcdfb_start_clock(sinfo); | ||
933 | if (sinfo->atmel_lcdfb_power_control) | ||
934 | sinfo->atmel_lcdfb_power_control(1); | ||
935 | lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon); | ||
936 | return 0; | ||
937 | } | ||
938 | |||
939 | #else | ||
940 | #define atmel_lcdfb_suspend NULL | ||
941 | #define atmel_lcdfb_resume NULL | ||
942 | #endif | ||
943 | |||
912 | static struct platform_driver atmel_lcdfb_driver = { | 944 | static struct platform_driver atmel_lcdfb_driver = { |
913 | .remove = __exit_p(atmel_lcdfb_remove), | 945 | .remove = __exit_p(atmel_lcdfb_remove), |
914 | 946 | .suspend = atmel_lcdfb_suspend, | |
915 | // FIXME need suspend, resume | 947 | .resume = atmel_lcdfb_resume, |
916 | 948 | ||
917 | .driver = { | 949 | .driver = { |
918 | .name = "atmel_lcdfb", | 950 | .name = "atmel_lcdfb", |
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h index 336c20db87f..2fd9fad922e 100644 --- a/include/video/atmel_lcdc.h +++ b/include/video/atmel_lcdc.h | |||
@@ -39,6 +39,7 @@ struct atmel_lcdfb_info { | |||
39 | u8 bl_power; | 39 | u8 bl_power; |
40 | #endif | 40 | #endif |
41 | bool lcdcon_is_backlight; | 41 | bool lcdcon_is_backlight; |
42 | u8 saved_lcdcon; | ||
42 | 43 | ||
43 | u8 default_bpp; | 44 | u8 default_bpp; |
44 | unsigned int default_lcdcon2; | 45 | unsigned int default_lcdcon2; |