[PATCH v2] RTC: PXA: Fix regression of interrupt before ioremap
Petr Cvek
petr.cvek at tul.cz
Thu Jan 29 03:51:38 PST 2015
Interrupts appear before register set of the PXA2xx RTC controller is ioremaped.
This fixes regression from:
'commit a44802f8fb7e593adabc6ef53c8df45a1717fa9b ("drivers/rtc/rtc-pxa.c: fix alarm can't wake up system issue")'
'commit 2f6e5f9458646263d3d9ffadd5e11e3d8d15a7d0 ("drivers/rtc: remove IRQF_DISABLED")'
Signed-off-by: Petr Cvek <petr.cvek at tul.cz>
---
drivers/rtc/rtc-pxa.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index 4561f37..d7d83e5 100644
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -346,7 +346,7 @@ static int __init pxa_rtc_probe(struct platform_device *pdev)
dev_err(dev, "No alarm IRQ resource defined\n");
return -ENXIO;
}
- pxa_rtc_open(dev);
+
pxa_rtc->base = devm_ioremap(dev, pxa_rtc->ress->start,
resource_size(pxa_rtc->ress));
if (!pxa_rtc->base) {
@@ -375,6 +375,10 @@ static int __init pxa_rtc_probe(struct platform_device *pdev)
return ret;
}
+ ret = pxa_rtc_open(dev);
+ if (ret)
+ return ret;
+
device_init_wakeup(dev, 1);
return 0;
--
1.7.12.1
More information about the linux-arm-kernel
mailing list