Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fedc9f1 authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

rtc-at91sam9 fixes 



Updates to the at91sam9 rtt-as-rtc driver:

 - Bugfix:  IRQ enable bits need shifting before masking with status
 - Platform code to initialize wakeup bits didn't get merged; cope

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Justin Waters <justin.waters@timesys.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3150e63d

drivers/rtc/rtc-at91sam9.c

+5 −1
Original line number Diff line number Diff line
@@ -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;