From 647d8d4fb7b0fc49ec57b7a662275df318d55efc Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 19 Mar 2008 17:01:09 -0700 Subject: [PATCH] --- yaml --- r: 87520 b: refs/heads/master c: 9fedc9f1b18f6b931c3b695d7280f17fc308309b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-at91sam9.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ed6986593903..c33e9a6aa97e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3150e63df41450a795bbd0bd98a8e70da74e0285 +refs/heads/master: 9fedc9f1b18f6b931c3b695d7280f17fc308309b diff --git a/trunk/drivers/rtc/rtc-at91sam9.c b/trunk/drivers/rtc/rtc-at91sam9.c index bbf10ecf416c..56728a2a3385 100644 --- a/trunk/drivers/rtc/rtc-at91sam9.c +++ b/trunk/drivers/rtc/rtc-at91sam9.c @@ -274,7 +274,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *_rtc) * SR clears it, so we must only read it in this irq handler! */ mr = rtt_readl(rtc, MR) & (AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN); - sr = rtt_readl(rtc, SR) & mr; + sr = rtt_readl(rtc, SR) & (mr >> 16); if (!sr) return IRQ_NONE; @@ -321,6 +321,10 @@ static int __init at91_rtc_probe(struct platform_device *pdev) if (!rtc) return -ENOMEM; + /* platform setup code should have handled this; sigh */ + if (!device_can_wakeup(&pdev->dev)) + device_init_wakeup(&pdev->dev, 1); + platform_set_drvdata(pdev, rtc); rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS); rtc->rtt += r->start;