From e5bbf2c8f7a6b21c43fd02268949a1fd93fe11e5 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Wed, 1 Apr 2009 14:45:17 +0000
Subject: [PATCH] --- yaml --- r: 141819 b: refs/heads/master c:
 faa9fa8e448ba4c0a9d61778fd3cda1313bf1533 h: refs/heads/master i:   141817:
 6524939d330d3b7dc83a1cb8c8b3e8ecb3aab426   141815:
 86c7af1ad588900e6642f45286d00c650e5cb8c9 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/rtc/rtc-sh.c | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b3ae11cb2f8..a2adcb93f75b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ba50df685e85b9d912a290d9614ffbeb4d9f060
+refs/heads/master: faa9fa8e448ba4c0a9d61778fd3cda1313bf1533
diff --git a/trunk/drivers/rtc/rtc-sh.c b/trunk/drivers/rtc/rtc-sh.c
index 4898f7fe8518..9b1ff12bf947 100644
--- a/trunk/drivers/rtc/rtc-sh.c
+++ b/trunk/drivers/rtc/rtc-sh.c
@@ -795,10 +795,46 @@ static int __devexit sh_rtc_remove(struct platform_device *pdev)
 
 	return 0;
 }
+
+static void sh_rtc_set_irq_wake(struct device *dev, int enabled)
+{
+	struct platform_device *pdev = to_platform_device(dev);
+	struct sh_rtc *rtc = platform_get_drvdata(pdev);
+
+	set_irq_wake(rtc->periodic_irq, enabled);
+	if (rtc->carry_irq > 0) {
+		set_irq_wake(rtc->carry_irq, enabled);
+		set_irq_wake(rtc->alarm_irq, enabled);
+	}
+
+}
+
+static int sh_rtc_suspend(struct device *dev)
+{
+	if (device_may_wakeup(dev))
+		sh_rtc_set_irq_wake(dev, 1);
+
+	return 0;
+}
+
+static int sh_rtc_resume(struct device *dev)
+{
+	if (device_may_wakeup(dev))
+		sh_rtc_set_irq_wake(dev, 0);
+
+	return 0;
+}
+
+static struct dev_pm_ops sh_rtc_dev_pm_ops = {
+	.suspend = sh_rtc_suspend,
+	.resume = sh_rtc_resume,
+};
+
 static struct platform_driver sh_rtc_platform_driver = {
 	.driver		= {
 		.name	= DRV_NAME,
 		.owner	= THIS_MODULE,
+		.pm	= &sh_rtc_dev_pm_ops,
 	},
 	.probe		= sh_rtc_probe,
 	.remove		= __devexit_p(sh_rtc_remove),