mirror of
https://github.com/torvalds/linux
synced 2024-09-20 02:57:25 +00:00
ARM: at91:rtc/rtc-at91sam9: ioremap register bank
Instead of computing virtual address with AT91_VA_BASE_SYS, use the appropriate ioremap() call on the driver "memory" resource. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
parent
e8c9dc93e2
commit
2dcc90e6ac
|
@ -307,8 +307,12 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
|
||||||
device_init_wakeup(&pdev->dev, 1);
|
device_init_wakeup(&pdev->dev, 1);
|
||||||
|
|
||||||
platform_set_drvdata(pdev, rtc);
|
platform_set_drvdata(pdev, rtc);
|
||||||
rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS);
|
rtc->rtt = ioremap(r->start, resource_size(r));
|
||||||
rtc->rtt += r->start;
|
if (!rtc->rtt) {
|
||||||
|
dev_err(&pdev->dev, "failed to map registers, aborting.\n");
|
||||||
|
ret = -ENOMEM;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
mr = rtt_readl(rtc, MR);
|
mr = rtt_readl(rtc, MR);
|
||||||
|
|
||||||
|
@ -326,7 +330,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
|
||||||
&at91_rtc_ops, THIS_MODULE);
|
&at91_rtc_ops, THIS_MODULE);
|
||||||
if (IS_ERR(rtc->rtcdev)) {
|
if (IS_ERR(rtc->rtcdev)) {
|
||||||
ret = PTR_ERR(rtc->rtcdev);
|
ret = PTR_ERR(rtc->rtcdev);
|
||||||
goto fail;
|
goto fail_register;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* register irq handler after we know what name we'll use */
|
/* register irq handler after we know what name we'll use */
|
||||||
|
@ -351,6 +355,8 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
fail_register:
|
||||||
|
iounmap(rtc->rtt);
|
||||||
fail:
|
fail:
|
||||||
platform_set_drvdata(pdev, NULL);
|
platform_set_drvdata(pdev, NULL);
|
||||||
kfree(rtc);
|
kfree(rtc);
|
||||||
|
@ -371,6 +377,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)
|
||||||
|
|
||||||
rtc_device_unregister(rtc->rtcdev);
|
rtc_device_unregister(rtc->rtcdev);
|
||||||
|
|
||||||
|
iounmap(rtc->rtt);
|
||||||
platform_set_drvdata(pdev, NULL);
|
platform_set_drvdata(pdev, NULL);
|
||||||
kfree(rtc);
|
kfree(rtc);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue