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

Commit 2dcc90e6 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

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: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent e8c9dc93

drivers/rtc/rtc-at91sam9.c

+10 −3
Original line number Diff line number Diff line
@@ -307,8 +307,12 @@ static int __init at91_rtc_probe(struct platform_device *pdev) 
		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;

	rtc->rtt = ioremap(r->start, resource_size(r));

	if (!rtc->rtt) {

		dev_err(&pdev->dev, "failed to map registers, aborting.\n");

		ret = -ENOMEM;

		goto fail;

	}



	mr = rtt_readl(rtc, MR);
@@ -326,7 +330,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) 
				&at91_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc->rtcdev)) {

		ret = PTR_ERR(rtc->rtcdev);

		goto fail;

		goto fail_register;

	}



	/* 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;



fail_register:

	iounmap(rtc->rtt);

fail:

	platform_set_drvdata(pdev, NULL);

	kfree(rtc);
@@ -371,6 +377,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev) 


	rtc_device_unregister(rtc->rtcdev);



	iounmap(rtc->rtt);

	platform_set_drvdata(pdev, NULL);

	kfree(rtc);

	return 0;