rtc: make rtc-omap driver ioremap its register space
PATCH v2 1/1 rtc: make rtc-omap driver ioremap its register space
From: Mark A. Greer <[email protected]>
The rtc-omap driver currently assumes that the rtc's registers are at a fixed address and already mapped into virtual memory space. Remove those assumptions so the same driver can be used for similar devices that reside at different physical addresses (e.g., TI's DA8xx/OMAP-L13x SoC's).
Also allow the possibility for the timer and alarm interrupts to use the same IRQ.
---
Sorry for the cross-posting but this is relevant to the different lists.
This patch was tested on a da830 and a da850. It was only compiled for an omap1 platform (don't have the hardware) but it should be low risk. Note that the platform_device data is already set up in arch/arm/mach-omap1/devices.c so it those platforms should "Just Work(tm)".
drivers/rtc/Kconfig | 7 ++++--- drivers/rtc/rtc-omap.c | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 24 deletions(-)
drivers/rtc/Kconfig +4 -3
@@ -539,10 +539,11 @@ comment "on-CPU RTC drivers" config RTC_DRV_OMAP tristate "TI OMAP1" - depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 + depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX help - Say "yes" here to support the real time clock on TI OMAP1 chips. - This driver can also be built as a module called rtc-omap. + Say "yes" here to support the real time clock on TI OMAP1 and + DA8xx/OMAP-L13x chips. This driver can also be built as a + module called rtc-omap. config RTC_DRV_S3C tristate "Samsung S3C series SoC RTC"
drivers/rtc/rtc-omap.c +26 -21
97 lines not on this page · raw message
Signature · 1 line
1.6.2.5.182.ga808d
A message that is not in the archive (sent off-list or not yet received): 20090917000458.GA6119-S3yzRvi4kHRa+ipTMWa7OQC/[email protected]
David Brownell
Acked-byQuoted 9 lines · Mark A. Greer
From: Mark A. Greer <[email protected]>
The rtc-omap driver currently assumes that the rtc's registers are at a fixed address and already mapped into virtual memory space. Remove those assumptions so the same driver can be used for similar devices that reside at different physical addresses (e.g., TI's DA8xx/OMAP-L13x SoC's).
Quoted 5 lines
Also allow the possibility for the timer and alarm interrupts to use the same IRQ.
Signed-off-by Mark A. Greer <[email protected]>CC David Brownell <david-b-yBeKhBN/[email protected]>
... but not tested on OMAP1 (e.g. OSK5912, H2).
Quoted 142 lines
---
Sorry for the cross-posting but this is relevant to the different lists.This patch was tested on a da830 and a da850. It was only compiled for an omap1 platform (don't have the hardware) but it should be low risk. Note that the
platform_devicedata is already set up inarch/arm/mach-omap1/devices.cso it those platforms should "Just Work(tm)".drivers/rtc/Kconfig | 7 ++++--- drivers/rtc/rtc-omap.c | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 24 deletions(-)drivers/rtc/Kconfig +4
-3@@ -539,10 +539,11 @@ comment "on-CPU RTC drivers" config RTC_DRV_OMAP tristate "TI OMAP1" - depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 + depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX help - Say "yes" here to support the real time clock on TI OMAP1 chips. - This driver can also be built as a module called rtc-omap. + Say "yes" here to support the real time clock on TI OMAP1 and + DA8xx/OMAP-L13x chips. This driver can also be built as a + module called rtc-omap. config RTC_DRV_S3C tristate "Samsung S3C series SoC RTC"drivers/rtc/rtc-omap.c +26
-21@@ -87,9 +87,10 @@#define OMAP_RTC_INTERRUPTS_IT_ALARM (1<<3)#define OMAP_RTC_INTERRUPTS_IT_TIMER (1<<2) +static void __iomem *rtc_base; -#define rtc_read (addr) omap_readb(OMAP_RTC_BASE + (addr)) -#define rtc_write (val, addr) omap_writeb(val, OMAP_RTC_BASE + (addr)) +#define rtc_read (addr) __raw_readb(rtc_base + (addr)) +#define rtc_write (val, addr) __raw_writeb(val, rtc_base + (addr))/* we rely on the rtc framework to handle locking (rtc->ops_lock), @@ -330,32 +331,31 @@ static int __init omap_rtc_probe(struct platform_device *pdev)return -ENOENT ; } -/* NOTE: using static mapping for RTC registers */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (res && res->start !=OMAP_RTC_BASE ) { -pr_debug ("%s: RTC registers at %08x, expected %08x\n" , - pdev->name, (unsigned ) res->start,OMAP_RTC_BASE ); +if (!res) { +pr_debug ("%s: RTC resource data missing\n" , pdev->name);return -ENOENT ; } -if (res) - mem =request_mem_region (res->start, - res->end - res->start +1 , - pdev->name); -else - mem =NULL ; + mem =request_mem_region (res->start,resource_size (res), pdev->name);if (!mem) {pr_debug ("%s: RTC registers at %08x are not free\n" , - pdev->name,OMAP_RTC_BASE ); + pdev->name, res->start);return -EBUSY ; } + rtc_base =ioremap (res->start,resource_size (res)); +if (!rtc_base) { +pr_debug ("%s: RTC registers can't be mapped\n" , pdev->name); + goto fail; + } + rtc =rtc_device_register (pdev->name, &pdev->dev, &omap_rtc_ops,THIS_MODULE );if (IS_ERR (rtc)) {pr_debug ("%s: can't register RTC device, err %ld\n" , pdev->name,PTR_ERR (rtc)); - goto fail; + goto fail0; }platform_set_drvdata (pdev, rtc);dev_set_drvdata (&rtc->dev, mem);@@ -380,13 +380,14 @@ static int __init omap_rtc_probe(struct platform_device *pdev) dev_name(&rtc->dev), rtc)) {pr_debug ("%s: RTC timer interrupt IRQ%d already claimed\n" , pdev->name, omap_rtc_timer); - goto fail0; + goto fail1; } -if (request_irq (omap_rtc_alarm, rtc_irq,IRQF_DISABLED , -dev_name (&rtc->dev), rtc)) { +if ((omap_rtc_timer != omap_rtc_alarm) && + (request_irq (omap_rtc_alarm, rtc_irq,IRQF_DISABLED , +dev_name (&rtc->dev), rtc))) {pr_debug ("%s: RTC alarm interrupt IRQ%d already claimed\n" , pdev->name, omap_rtc_alarm); - goto fail1; + goto fail2; }/* On boards with split power, RTC_ON_NOFF won't reset the RTC */ @@ -419,10 +420,12 @@ static int __init omap_rtc_probe(struct platform_device *pdev)return 0 ; -fail1: +fail2:free_irq (omap_rtc_timer,NULL ); -fail0: +fail1:rtc_device_unregister (rtc); +fail0: +iounmap (rtc_base); fail:release_resource (mem);return -EIO ;@@ -438,7 +441,9 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)rtc_write (0 ,OMAP_RTC_INTERRUPTS_REG );free_irq (omap_rtc_timer, rtc); -free_irq (omap_rtc_alarm, rtc); + +if (omap_rtc_timer != omap_rtc_alarm) +free_irq (omap_rtc_alarm, rtc);release_resource (dev_get_drvdata (&rtc->dev));rtc_device_unregister (rtc);Signature · 1 line
1.6.2.5.182.ga808d
Quoted 9 lines · Mark A. Greer
From: Mark A. Greer <[email protected]>
The rtc-omap driver currently assumes that the rtc's registers are at a fixed address and already mapped into virtual memory space. Remove those assumptions so the same driver can be used for similar devices that reside at different physical addresses (e.g., TI's DA8xx/OMAP-L13x SoC's).
Quoted 6 lines
Also allow the possibility for the timer and alarm interrupts to use the same IRQ.
Signed-off-by Mark A. Greer <[email protected]>CC David Brownell <david-b-yBeKhBN/[email protected]>---
Ping?
Just wondering if this patch was noticed.
FYI, the following were added by subsequent emails:
Thanks,
Mark
--
Quoted 3 lines · On Tue, 13 Oct 2009 16:00:23 -0700 "Mark A. Greer" <[email protected]> wrote:
Ping?
Just wondering if this patch was noticed.
noticed. it's in the queue for the next submission set, which means after upstream merges all of current pending patches (which are now in -mm) .
Signature · 6 lines
Best regards, Alessandro Zummo, Tower Technologies - Torino, Italy http://www.towertech.it
Quoted 9 lines · Mark A. Greer
From: Mark A. Greer <[email protected]>
The rtc-omap driver currently assumes that the rtc's registers are at a fixed address and already mapped into virtual memory space. Remove those assumptions so the same driver can be used for similar devices that reside at different physical addresses (e.g., TI's DA8xx/OMAP-L13x SoC's).
Quoted 5 lines
Also allow the possibility for the timer and alarm interrupts to use the same IRQ.
Signed-off-by Mark A. Greer <[email protected]>CC David Brownell <[email protected]>
for relevance to davinci platforms.
Kevin
Quoted 145 lines
---
Sorry for the cross-posting but this is relevant to the different lists.This patch was tested on a da830 and a da850. It was only compiled for an omap1 platform (don't have the hardware) but it should be low risk. Note that the
platform_devicedata is already set up inarch/arm/mach-omap1/devices.cso it those platforms should "Just Work(tm)".drivers/rtc/Kconfig | 7 ++++--- drivers/rtc/rtc-omap.c | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 24 deletions(-)drivers/rtc/Kconfig +4
-3@@ -539,10 +539,11 @@ comment "on-CPU RTC drivers" config RTC_DRV_OMAP tristate "TI OMAP1" - depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 + depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX help - Say "yes" here to support the real time clock on TI OMAP1 chips. - This driver can also be built as a module called rtc-omap. + Say "yes" here to support the real time clock on TI OMAP1 and + DA8xx/OMAP-L13x chips. This driver can also be built as a + module called rtc-omap. config RTC_DRV_S3C tristate "Samsung S3C series SoC RTC"drivers/rtc/rtc-omap.c +26
-21@@ -87,9 +87,10 @@#define OMAP_RTC_INTERRUPTS_IT_ALARM (1<<3)#define OMAP_RTC_INTERRUPTS_IT_TIMER (1<<2) +static void __iomem *rtc_base; -#define rtc_read (addr) omap_readb(OMAP_RTC_BASE + (addr)) -#define rtc_write (val, addr) omap_writeb(val, OMAP_RTC_BASE + (addr)) +#define rtc_read (addr) __raw_readb(rtc_base + (addr)) +#define rtc_write (val, addr) __raw_writeb(val, rtc_base + (addr))/* we rely on the rtc framework to handle locking (rtc->ops_lock), @@ -330,32 +331,31 @@ static int __init omap_rtc_probe(struct platform_device *pdev)return -ENOENT ; } -/* NOTE: using static mapping for RTC registers */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (res && res->start !=OMAP_RTC_BASE ) { -pr_debug ("%s: RTC registers at %08x, expected %08x\n" , - pdev->name, (unsigned ) res->start,OMAP_RTC_BASE ); +if (!res) { +pr_debug ("%s: RTC resource data missing\n" , pdev->name);return -ENOENT ; } -if (res) - mem =request_mem_region (res->start, - res->end - res->start +1 , - pdev->name); -else - mem =NULL ; + mem =request_mem_region (res->start,resource_size (res), pdev->name);if (!mem) {pr_debug ("%s: RTC registers at %08x are not free\n" , - pdev->name,OMAP_RTC_BASE ); + pdev->name, res->start);return -EBUSY ; } + rtc_base =ioremap (res->start,resource_size (res)); +if (!rtc_base) { +pr_debug ("%s: RTC registers can't be mapped\n" , pdev->name); + goto fail; + } + rtc =rtc_device_register (pdev->name, &pdev->dev, &omap_rtc_ops,THIS_MODULE );if (IS_ERR (rtc)) {pr_debug ("%s: can't register RTC device, err %ld\n" , pdev->name,PTR_ERR (rtc)); - goto fail; + goto fail0; }platform_set_drvdata (pdev, rtc);dev_set_drvdata (&rtc->dev, mem);@@ -380,13 +380,14 @@ static int __init omap_rtc_probe(struct platform_device *pdev) dev_name(&rtc->dev), rtc)) {pr_debug ("%s: RTC timer interrupt IRQ%d already claimed\n" , pdev->name, omap_rtc_timer); - goto fail0; + goto fail1; } -if (request_irq (omap_rtc_alarm, rtc_irq,IRQF_DISABLED , -dev_name (&rtc->dev), rtc)) { +if ((omap_rtc_timer != omap_rtc_alarm) && + (request_irq (omap_rtc_alarm, rtc_irq,IRQF_DISABLED , +dev_name (&rtc->dev), rtc))) {pr_debug ("%s: RTC alarm interrupt IRQ%d already claimed\n" , pdev->name, omap_rtc_alarm); - goto fail1; + goto fail2; }/* On boards with split power, RTC_ON_NOFF won't reset the RTC */ @@ -419,10 +420,12 @@ static int __init omap_rtc_probe(struct platform_device *pdev)return 0 ; -fail1: +fail2:free_irq (omap_rtc_timer,NULL ); -fail0: +fail1:rtc_device_unregister (rtc); +fail0: +iounmap (rtc_base); fail:release_resource (mem);return -EIO ;@@ -438,7 +441,9 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)rtc_write (0 ,OMAP_RTC_INTERRUPTS_REG );free_irq (omap_rtc_timer, rtc); -free_irq (omap_rtc_alarm, rtc); + +if (omap_rtc_timer != omap_rtc_alarm) +free_irq (omap_rtc_alarm, rtc);release_resource (dev_get_drvdata (&rtc->dev));rtc_device_unregister (rtc);Signature · 6 lines
1.6.2.5.182.ga808d -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Tony Lindgren
Acked-byQuoted 14 lines · Kevin Hilman
Quoted 12 lines · Mark A. Greer
From: Mark A. Greer <[email protected]>
The rtc-omap driver currently assumes that the rtc's registers are at a fixed address and already mapped into virtual memory space. Remove those assumptions so the same driver can be used for similar devices that reside at different physical addresses (e.g., TI's DA8xx/OMAP-L13x SoC's).
Also allow the possibility for the timer and alarm interrupts to use the same IRQ.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Mark A. Greer <[email protected]>CC David Brownell <[email protected]>Acked-by Kevin Hilman <[email protected]>for relevance to davinci platforms.
Quoted 153 lines
Kevin
Quoted 145 lines
---
Sorry for the cross-posting but this is relevant to the different lists.This patch was tested on a da830 and a da850. It was only compiled for an omap1 platform (don't have the hardware) but it should be low risk. Note that the
platform_devicedata is already set up inarch/arm/mach-omap1/devices.cso it those platforms should "Just Work(tm)".drivers/rtc/Kconfig | 7 ++++--- drivers/rtc/rtc-omap.c | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 24 deletions(-)drivers/rtc/Kconfig +4
-3@@ -539,10 +539,11 @@ comment "on-CPU RTC drivers" config RTC_DRV_OMAP tristate "TI OMAP1" - depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 + depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX help - Say "yes" here to support the real time clock on TI OMAP1 chips. - This driver can also be built as a module called rtc-omap. + Say "yes" here to support the real time clock on TI OMAP1 and + DA8xx/OMAP-L13x chips. This driver can also be built as a + module called rtc-omap. config RTC_DRV_S3C tristate "Samsung S3C series SoC RTC"drivers/rtc/rtc-omap.c +26
-21@@ -87,9 +87,10 @@#define OMAP_RTC_INTERRUPTS_IT_ALARM (1<<3)#define OMAP_RTC_INTERRUPTS_IT_TIMER (1<<2) +static void __iomem *rtc_base; -#define rtc_read (addr) omap_readb(OMAP_RTC_BASE + (addr)) -#define rtc_write (val, addr) omap_writeb(val, OMAP_RTC_BASE + (addr)) +#define rtc_read (addr) __raw_readb(rtc_base + (addr)) +#define rtc_write (val, addr) __raw_writeb(val, rtc_base + (addr))/* we rely on the rtc framework to handle locking (rtc->ops_lock), @@ -330,32 +331,31 @@ static int __init omap_rtc_probe(struct platform_device *pdev)return -ENOENT ; } -/* NOTE: using static mapping for RTC registers */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (res && res->start !=OMAP_RTC_BASE ) { -pr_debug ("%s: RTC registers at %08x, expected %08x\n" , - pdev->name, (unsigned ) res->start,OMAP_RTC_BASE ); +if (!res) { +pr_debug ("%s: RTC resource data missing\n" , pdev->name);return -ENOENT ; } -if (res) - mem =request_mem_region (res->start, - res->end - res->start +1 , - pdev->name); -else - mem =NULL ; + mem =request_mem_region (res->start,resource_size (res), pdev->name);if (!mem) {pr_debug ("%s: RTC registers at %08x are not free\n" , - pdev->name,OMAP_RTC_BASE ); + pdev->name, res->start);return -EBUSY ; } + rtc_base =ioremap (res->start,resource_size (res)); +if (!rtc_base) { +pr_debug ("%s: RTC registers can't be mapped\n" , pdev->name); + goto fail; + } + rtc =rtc_device_register (pdev->name, &pdev->dev, &omap_rtc_ops,THIS_MODULE );if (IS_ERR (rtc)) {pr_debug ("%s: can't register RTC device, err %ld\n" , pdev->name,PTR_ERR (rtc)); - goto fail; + goto fail0; }platform_set_drvdata (pdev, rtc);dev_set_drvdata (&rtc->dev, mem);@@ -380,13 +380,14 @@ static int __init omap_rtc_probe(struct platform_device *pdev) dev_name(&rtc->dev), rtc)) {pr_debug ("%s: RTC timer interrupt IRQ%d already claimed\n" , pdev->name, omap_rtc_timer); - goto fail0; + goto fail1; } -if (request_irq (omap_rtc_alarm, rtc_irq,IRQF_DISABLED , -dev_name (&rtc->dev), rtc)) { +if ((omap_rtc_timer != omap_rtc_alarm) && + (request_irq (omap_rtc_alarm, rtc_irq,IRQF_DISABLED , +dev_name (&rtc->dev), rtc))) {pr_debug ("%s: RTC alarm interrupt IRQ%d already claimed\n" , pdev->name, omap_rtc_alarm); - goto fail1; + goto fail2; }/* On boards with split power, RTC_ON_NOFF won't reset the RTC */ @@ -419,10 +420,12 @@ static int __init omap_rtc_probe(struct platform_device *pdev)return 0 ; -fail1: +fail2:free_irq (omap_rtc_timer,NULL ); -fail0: +fail1:rtc_device_unregister (rtc); +fail0: +iounmap (rtc_base); fail:release_resource (mem);return -EIO ;@@ -438,7 +441,9 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)rtc_write (0 ,OMAP_RTC_INTERRUPTS_REG );free_irq (omap_rtc_timer, rtc); -free_irq (omap_rtc_alarm, rtc); + +if (omap_rtc_timer != omap_rtc_alarm) +free_irq (omap_rtc_alarm, rtc);release_resource (dev_get_drvdata (&rtc->dev));rtc_device_unregister (rtc);Signature · 6 lines
1.6.2.5.182.ga808d -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html