diff options
| author | Magnus Damm <damm@igel.co.jp> | 2009-08-14 22:53:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-14 23:58:45 -0400 |
| commit | f6431732f128a241b149c0aa85dfec852455ebf9 (patch) | |
| tree | a345f9bcba42b13199512d00b430f985fa800138 | |
| parent | 21bc1f024d0d4ea43fc0f2a43504e759261c7b18 (diff) | |
sh: CMT suspend/resume
This patch updates the SuperH CMT driver with suspend and resume
callbacks for the suspend-to-ram case. This patch stops the CMT
channel at suspend time to avoid unwanted wake up events.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | drivers/clocksource/sh_cmt.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 2964f5f4a7ef..6b3e0c2f33e2 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c | |||
| @@ -40,6 +40,7 @@ struct sh_cmt_priv { | |||
| 40 | struct platform_device *pdev; | 40 | struct platform_device *pdev; |
| 41 | 41 | ||
| 42 | unsigned long flags; | 42 | unsigned long flags; |
| 43 | unsigned long flags_suspend; | ||
| 43 | unsigned long match_value; | 44 | unsigned long match_value; |
| 44 | unsigned long next_match_value; | 45 | unsigned long next_match_value; |
| 45 | unsigned long max_match_value; | 46 | unsigned long max_match_value; |
| @@ -667,11 +668,38 @@ static int __devexit sh_cmt_remove(struct platform_device *pdev) | |||
| 667 | return -EBUSY; /* cannot unregister clockevent and clocksource */ | 668 | return -EBUSY; /* cannot unregister clockevent and clocksource */ |
| 668 | } | 669 | } |
| 669 | 670 | ||
| 671 | static int sh_cmt_suspend(struct device *dev) | ||
| 672 | { | ||
| 673 | struct platform_device *pdev = to_platform_device(dev); | ||
| 674 | struct sh_cmt_priv *p = platform_get_drvdata(pdev); | ||
| 675 | |||
| 676 | /* save flag state and stop CMT channel */ | ||
| 677 | p->flags_suspend = p->flags; | ||
| 678 | sh_cmt_stop(p, p->flags); | ||
| 679 | return 0; | ||
| 680 | } | ||
| 681 | |||
| 682 | static int sh_cmt_resume(struct device *dev) | ||
| 683 | { | ||
| 684 | struct platform_device *pdev = to_platform_device(dev); | ||
| 685 | struct sh_cmt_priv *p = platform_get_drvdata(pdev); | ||
| 686 | |||
| 687 | /* start CMT channel from saved state */ | ||
| 688 | sh_cmt_start(p, p->flags_suspend); | ||
| 689 | return 0; | ||
| 690 | } | ||
| 691 | |||
| 692 | static struct dev_pm_ops sh_cmt_dev_pm_ops = { | ||
| 693 | .suspend = sh_cmt_suspend, | ||
| 694 | .resume = sh_cmt_resume, | ||
| 695 | }; | ||
| 696 | |||
| 670 | static struct platform_driver sh_cmt_device_driver = { | 697 | static struct platform_driver sh_cmt_device_driver = { |
| 671 | .probe = sh_cmt_probe, | 698 | .probe = sh_cmt_probe, |
| 672 | .remove = __devexit_p(sh_cmt_remove), | 699 | .remove = __devexit_p(sh_cmt_remove), |
| 673 | .driver = { | 700 | .driver = { |
| 674 | .name = "sh_cmt", | 701 | .name = "sh_cmt", |
| 702 | .pm = &sh_cmt_dev_pm_ops, | ||
| 675 | } | 703 | } |
| 676 | }; | 704 | }; |
| 677 | 705 | ||
