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

Commit 8cfde8c1 authored by Mark A. Greer's avatar Mark A. Greer Committed by Linus Torvalds
Browse files

rtc: make rtc-omap driver ioremap its register space 



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.

Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43299f28

drivers/rtc/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -597,10 +597,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
Original line number Diff line number Diff line
@@ -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,6 +441,8 @@ static int __exit omap_rtc_remove(struct platform_device *pdev) 
	rtc_write(0, OMAP_RTC_INTERRUPTS_REG);



	free_irq(omap_rtc_timer, rtc);



	if (omap_rtc_timer != omap_rtc_alarm)

		free_irq(omap_rtc_alarm, rtc);



	release_resource(dev_get_drvdata(&rtc->dev));