diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-12-30 20:00:23 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-12-30 21:53:32 +0800 |
| commit | b13bc57de3670c2dbd6670334f570b3134eb506c (patch) | |
| tree | 7f76aefb3ffbbfa173df598bfac83e134d6f7c17 | |
| parent | 765d86228a175d0068e6b3e4b87300de0f4fe522 (diff) | |
imx6q: add device tree support for SNVS RTC
Signed-off-by: Eric Miao <eric.miao@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 1 | ||||
| -rw-r--r-- | drivers/rtc/rtc-snvs.c | 25 |
2 files changed, 21 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 263e8f3664b..bc554390001 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -359,6 +359,7 @@ }; snvs@020cc000 { + compatible = "fsl,snvs"; reg = <0x020cc000 0x4000>; interrupts = <0 19 0x04 0 20 0x04>; }; diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c index 08e5378dd2e..d6e82ceaa56 100644 --- a/drivers/rtc/rtc-snvs.c +++ b/drivers/rtc/rtc-snvs.c @@ -46,6 +46,8 @@ #include <linux/uaccess.h> #include <linux/io.h> #include <linux/sched.h> +#include <linux/of.h> +#include <linux/of_device.h> /* Register definitions */ #define SNVS_HPSR 0x14 /* HP Status Register */ @@ -477,9 +479,14 @@ static int snvs_rtc_probe(struct platform_device *pdev) if (!pdata) return -ENOMEM; + ioaddr = ioremap(res->start, resource_size(res)); + if (ioaddr == NULL) { + kfree(pdata); + return -ENOMEM; + } + pdata->baseaddr = res->start; - pdata->ioaddr = ioremap(pdata->baseaddr, 0xC00); - ioaddr = pdata->ioaddr; + pdata->ioaddr = ioaddr; /* Configure and enable the RTC */ pdata->irq = platform_get_irq(pdev, 0); @@ -511,6 +518,8 @@ static int snvs_rtc_probe(struct platform_device *pdev) __raw_writel(0xFFFFFFFF, ioaddr + SNVS_LPSR); udelay(100); + platform_set_drvdata(pdev, pdata); + rtc = rtc_device_register(pdev->name, &pdev->dev, &snvs_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) { @@ -519,7 +528,6 @@ static int snvs_rtc_probe(struct platform_device *pdev) } pdata->rtc = rtc; - platform_set_drvdata(pdev, pdata); tv.tv_nsec = 0; tv.tv_sec = rtc_read_lp_counter(ioaddr + SNVS_LPSRTCMR); @@ -597,13 +605,20 @@ static int snvs_rtc_resume(struct platform_device *pdev) return 0; } +static const struct of_device_id snvs_dt_ids[] = { + { .compatible = "fsl,snvs" }, + { /* sentinel */ } +}; + /*! * Contains pointers to the power management callback functions. */ static struct platform_driver snvs_rtc_driver = { .driver = { - .name = "snvs_rtc", - }, + .name = "snvs_rtc", + .owner = THIS_MODULE, + .of_match_table = snvs_dt_ids, + }, .probe = snvs_rtc_probe, .remove = __exit_p(snvs_rtc_remove), .suspend = snvs_rtc_suspend, |