* [RFC PATCH] Au1xxx on-chip counter-as-RTC driver
@ 2008-08-09 14:14 Manuel Lauss
2008-10-21 18:38 ` [rtc-linux] " Alessandro Zummo
0 siblings, 1 reply; 8+ messages in thread
From: Manuel Lauss @ 2008-08-09 14:14 UTC (permalink / raw)
To: rtc-linux, Linux-MIPS; +Cc: Kevin Hickey
Hello,
Here's a very simple patch which implements an RTC using
the TOY counter (counter0) on the Au1000 family of SoCs.
It works so far on the DB1200 board; however it takes up
to 5 seconds until the written value actually hits the
register, so the hardware clock is always off (the minimum
seems to be 3 seconds on the DB1200). I'd like to get
some feedback on how to work around this "anomaly".
Patch applies on top of the Au1xxx update patches posted
here: http://marc.info/?l=linux-mips&m=121735077313715&w=2
and current -git.
Thanks!
Manuel Lauss
---
From: Manuel Lauss <mano@roarinelk.homelinux.net>
Subject: [PATCH] RTC: Au1000 On-Chip Counter0-as-RTC driver.
This simple driver uses Counter0 of the Au1xxx SoC as a
Real Time Clock. Currently it only supports setting and
retrieving time.
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
---
arch/mips/au1000/common/platform.c | 8 --
arch/mips/au1000/pb1200/platform.c | 6 +
drivers/rtc/Kconfig | 9 ++
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-au1xxx.c | 188 ++++++++++++++++++++++++++++++++++++
5 files changed, 204 insertions(+), 8 deletions(-)
create mode 100644 drivers/rtc/rtc-au1xxx.c
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 9d12e6b..f29930e 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -616,14 +616,6 @@ static struct attribute_group db1x_pmattr_group = {
*/
static int __init pm_init(void)
{
- /* init TOY to tick at 1Hz. No need to wait for access bits
- * since there's plenty of time between here and the first
- * suspend cycle.
- */
- au_writel(32767, SYS_TOYTRIM);
- au_writel(0, SYS_TOYWRITE);
- au_sync();
-
db1x_pm_last_wakesrc = au_readl(SYS_WAKESRC);
au_writel(0, SYS_WAKESRC);
diff --git a/arch/mips/au1000/pb1200/platform.c b/arch/mips/au1000/pb1200/platform.c
index 9530329..1a5b160 100644
--- a/arch/mips/au1000/pb1200/platform.c
+++ b/arch/mips/au1000/pb1200/platform.c
@@ -152,7 +152,13 @@ static struct platform_device smc91c111_device = {
.resource = smc91c111_resources
};
+static struct platform_device rtc_device = {
+ .name = "rtc-au1xxx",
+ .id = -1,
+};
+
static struct platform_device *board_platform_devices[] __initdata = {
+ &rtc_device,
&ide_device,
&smc91c111_device
};
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 90ab738..8747a66 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -559,6 +559,15 @@ config RTC_DRV_AT91SAM9_GPBR
will be used. The default of zero is normally OK to use, but
on some systems other software needs to use that register.
+config RTC_DRV_AU1XXX
+ tristate "Au1xxx TOY-as-RTC support"
+ depends on SOC_AU1X00
+ help
+ This driver uses Au1000 on-chip Counter0 as a Real Time Clock.
+
+ This driver can also be built as a module. If so, the module
+ will be called rtc-au1xxx.
+
config RTC_DRV_BFIN
tristate "Blackfin On-Chip RTC"
depends on BLACKFIN
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 18622ef..6a33a18 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -20,6 +20,7 @@ rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
obj-$(CONFIG_RTC_DRV_AT32AP700X)+= rtc-at32ap700x.o
obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o
+obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o
obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o
obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o
obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
new file mode 100644
index 0000000..0b67832
--- /dev/null
+++ b/drivers/rtc/rtc-au1xxx.c
@@ -0,0 +1,188 @@
+/*
+ * Au1xxx On-Chip Counters Real Time Clock interface driver.
+ *
+ * Copyright (C) 2008 Manuel Lauss <mano@roarinelk.homelinux.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+/* All currently known (to me at least) Au1xxx chips have 2 counters with
+ * programmable dividers, fed by an external 32.768 kHz clocksource.
+ * Counter 0, which keeps counting during sleep/powerdown, is used here
+ * as a simple 1Hz counter which stores the current date as the time in
+ * seconds since the dawn of the UNIX epoch.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <asm/mach-au1x00/au1000.h>
+
+/* 32kHz clock enabled and detected */
+#define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)
+
+struct au1xtoy_rtc {
+ struct rtc_device *rtc_dev;
+ spinlock_t lock;
+};
+
+static int au1xtoy_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct au1xtoy_rtc *rtc = platform_get_drvdata(pdev);
+ unsigned long t;
+
+ spin_lock_irq(&rtc->lock);
+
+ t = au_readl(SYS_TOYREAD);
+ rtc_time_to_tm(t, tm);
+
+ if (rtc_valid_tm(tm) < 0) {
+ dev_err(dev, "invalid date\n");
+ rtc_time_to_tm(0, tm);
+ }
+
+ spin_unlock_irq(&rtc->lock);
+
+ return 0;
+}
+
+static int au1xtoy_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct au1xtoy_rtc *rtc = platform_get_drvdata(pdev);
+ unsigned long t;
+
+ rtc_tm_to_time(tm, &t);
+
+ spin_lock_irq(&rtc->lock);
+
+ au_writel(t, SYS_TOYWRITE);
+ au_sync();
+
+ /* wait until the hardware again allows writes to the TOY counter */
+ while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
+ asm volatile ("nop");
+
+ spin_unlock_irq(&rtc->lock);
+
+ return 0;
+}
+
+static struct rtc_class_ops au1xtoy_rtc_ops = {
+ .read_time = au1xtoy_rtc_read_time,
+ .set_time = au1xtoy_rtc_set_time,
+};
+
+static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev)
+{
+ struct au1xtoy_rtc *rtc;
+ unsigned long u, to;
+ int ret;
+
+ rtc = kzalloc(sizeof(struct au1xtoy_rtc), GFP_KERNEL);
+ if (unlikely(!rtc))
+ return -ENOMEM;
+
+ spin_lock_init(&rtc->lock);
+
+ /* In Firmware We Trust(TM): if the firmware has enabled the
+ * counters and hardware says 32kHz clock is detected, then
+ * we can consider the counters usable.
+ */
+ u = au_readl(SYS_COUNTER_CNTRL);
+ if (!(u & CNTR_OK)) {
+ dev_err(&pdev->dev, "counters disabled by firmware\n");
+ ret = -ENODEV;
+ goto out_err;
+ }
+
+ ret = -ETIMEDOUT;
+
+ /* wait until hardware gives access to TRIM register */
+ to = 0x00100000;
+ while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && to--)
+ asm volatile ("nop");
+
+ if (!to) {
+ /* timed out waiting for register access. Counters may
+ * be unusable, so bail out.
+ */
+ dev_err(&pdev->dev, "timed out waiting for reg access\n");
+ goto out_err;
+ }
+
+ /* set 1Hz TOY tick rate */
+ au_writel(32767, SYS_TOYTRIM);
+ au_sync();
+
+ /* wait until the hardware allows writes to the TOY counter, so
+ * that the first write succeeds immediately.
+ */
+ while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
+ asm volatile ("nop");
+
+ rtc->rtc_dev = rtc_device_register("rtc-au1xxx", &pdev->dev,
+ &au1xtoy_rtc_ops, THIS_MODULE);
+ if (IS_ERR(rtc->rtc_dev)) {
+ ret = PTR_ERR(rtc->rtc_dev);
+ goto out_err;
+ }
+
+ platform_set_drvdata(pdev, rtc);
+
+ printk(KERN_INFO "Au1000 TOY-based Real Time Clock installed.\n");
+
+ return 0;
+
+out_err:
+ kfree(rtc);
+ return ret;
+}
+
+static int __devexit au1xtoy_rtc_remove(struct platform_device *pdev)
+{
+ struct au1xtoy_rtc *rtc = platform_get_drvdata(pdev);
+
+ if (likely(rtc->rtc_dev))
+ rtc_device_unregister(rtc->rtc_dev);
+
+ platform_set_drvdata(pdev, NULL);
+
+ kfree(rtc);
+
+ return 0;
+}
+
+static struct platform_driver au1xtoy_rtc_platform_driver = {
+ .driver = {
+ .name = "rtc-au1xxx",
+ .owner = THIS_MODULE,
+ },
+ .probe = au1xtoy_rtc_probe,
+ .remove = __devexit_p(au1xtoy_rtc_remove),
+};
+
+static int __init au1xtoy_rtc_init(void)
+{
+ return platform_driver_register(&au1xtoy_rtc_platform_driver);
+}
+
+static void __exit au1xtoy_rtc_exit(void)
+{
+ platform_driver_unregister(&au1xtoy_rtc_platform_driver);
+}
+
+module_init(au1xtoy_rtc_init);
+module_exit(au1xtoy_rtc_exit);
+
+MODULE_DESCRIPTION("Au1xxx On-Chip counter RTC driver");
+MODULE_AUTHOR("Manuel Lauss");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:rtc-au1xxx");
--
1.5.6.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [rtc-linux] [RFC PATCH] Au1xxx on-chip counter-as-RTC driver
2008-08-09 14:14 [RFC PATCH] Au1xxx on-chip counter-as-RTC driver Manuel Lauss
@ 2008-10-21 18:38 ` Alessandro Zummo
2008-10-22 7:31 ` Manuel Lauss
0 siblings, 1 reply; 8+ messages in thread
From: Alessandro Zummo @ 2008-10-21 18:38 UTC (permalink / raw)
To: rtc-linux; +Cc: mano, Linux-MIPS, Kevin Hickey
On Sat, 9 Aug 2008 16:14:02 +0200
Manuel Lauss <mano@roarinelk.homelinux.net> wrote:
> It works so far on the DB1200 board; however it takes up
> to 5 seconds until the written value actually hits the
> register, so the hardware clock is always off (the minimum
> seems to be 3 seconds on the DB1200). I'd like to get
> some feedback on how to work around this "anomaly".
Hi Manuel,
any news on this driver? I'd need feedback from linux-mips
to get it thru.
--
Best regards,
Alessandro Zummo,
Tower Technologies - Torino, Italy
http://www.towertech.it
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rtc-linux] [RFC PATCH] Au1xxx on-chip counter-as-RTC driver
2008-10-21 18:38 ` [rtc-linux] " Alessandro Zummo
@ 2008-10-22 7:31 ` Manuel Lauss
2008-10-28 10:17 ` [rtc-linux] " Alessandro Zummo
0 siblings, 1 reply; 8+ messages in thread
From: Manuel Lauss @ 2008-10-22 7:31 UTC (permalink / raw)
To: Alessandro Zummo; +Cc: rtc-linux, Linux-MIPS, Kevin Hickey
Hi Alessandro,
On Tue, Oct 21, 2008 at 08:38:15PM +0200, Alessandro Zummo wrote:
> On Sat, 9 Aug 2008 16:14:02 +0200
> Manuel Lauss <mano@roarinelk.homelinux.net> wrote:
>
> > It works so far on the DB1200 board; however it takes up
> > to 5 seconds until the written value actually hits the
> > register, so the hardware clock is always off (the minimum
> > seems to be 3 seconds on the DB1200). I'd like to get
> > some feedback on how to work around this "anomaly".
>
> Hi Manuel,
>
> any news on this driver? I'd need feedback from linux-mips
> to get it thru.
Here's a slightly updated version which has been running on a DB1200
demoboard for almost 2 months now. I received no feedback on the
original, unfortunately.
Thanks!
Manuel Lauss
---
From: Manuel Lauss <mano@roarinelk.homelinux.net>
Date: Sat, 9 Aug 2008 15:27:55 +0200
Subject: [PATCH] RTC: Au1000 On-Chip Counter0-as-RTC driver.
Simple driver which uses the Au1xxx Time-Of-Year counter (counter0)
as a 1Hz RTC.
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
---
arch/mips/alchemy/pb1200/platform.c | 6 +
drivers/rtc/Kconfig | 9 ++
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-au1xxx.c | 189 +++++++++++++++++++++++++++++++++++
4 files changed, 205 insertions(+), 0 deletions(-)
create mode 100644 drivers/rtc/rtc-au1xxx.c
diff --git a/arch/mips/alchemy/pb1200/platform.c b/arch/mips/alchemy/pb1200/platform.c
index f8fb0ae..8f3bc98 100644
--- a/arch/mips/alchemy/pb1200/platform.c
+++ b/arch/mips/alchemy/pb1200/platform.c
@@ -71,7 +71,13 @@ static struct platform_device smc91c111_device = {
.resource = smc91c111_resources
};
+static struct platform_device rtc_device = {
+ .name = "rtc-au1xxx",
+ .id = -1,
+};
+
static struct platform_device *board_platform_devices[] __initdata = {
+ &rtc_device,
&ide_device,
&smc91c111_device
};
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 814f49f..0a7aac4 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -594,6 +594,15 @@ config RTC_DRV_AT91SAM9_GPBR
will be used. The default of zero is normally OK to use, but
on some systems other software needs to use that register.
+config RTC_DRV_AU1XXX
+ tristate "Au1xxx TOY-as-RTC support"
+ depends on SOC_AU1X00
+ help
+ This driver uses Au1000 on-chip Counter0 as a Real Time Clock.
+
+ This driver can also be built as a module. If so, the module
+ will be called rtc-au1xxx.
+
config RTC_DRV_BFIN
tristate "Blackfin On-Chip RTC"
depends on BLACKFIN && !BF561
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index d6a9ac7..796a179 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -20,6 +20,7 @@ rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
obj-$(CONFIG_RTC_DRV_AT32AP700X)+= rtc-at32ap700x.o
obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o
+obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o
obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o
obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o
obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
new file mode 100644
index 0000000..fb05eec
--- /dev/null
+++ b/drivers/rtc/rtc-au1xxx.c
@@ -0,0 +1,189 @@
+/*
+ * Au1xxx counter0 (aka Time-of-year counter) RTC interface driver.
+ *
+ * Copyright (C) 2008 Manuel Lauss <mano@roarinelk.homelinux.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+/* All current Au1xxx SoCs have 2 counters fed by an external 32.768 kHz
+ * crystal. Counter 0, which keeps counting during sleep/powerdown, is
+ * used to count seconds since the beginning of the unix epoch.
+ *
+ * The counters must be configured and enabled by bootloader/board code;
+ * no checks as to whether they really get a proper 32.768kHz clock are
+ * made.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <asm/mach-au1x00/au1000.h>
+
+/* 32kHz clock enabled and detected */
+#define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)
+
+struct au1xtoy_rtc {
+ struct rtc_device *rtc_dev;
+ struct mutex toycnt_lock;
+};
+
+static int au1xtoy_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct au1xtoy_rtc *rtc = platform_get_drvdata(pdev);
+ unsigned long t;
+
+ if (mutex_lock_interruptible(&rtc->toycnt_lock))
+ return -ERESTARTSYS;
+
+ t = au_readl(SYS_TOYREAD);
+ mutex_unlock(&rtc->toycnt_lock);
+
+ rtc_time_to_tm(t, tm);
+
+ if (rtc_valid_tm(tm) < 0) {
+ dev_err(dev, "invalid date stored in counter0\n");
+ rtc_time_to_tm(0, tm);
+ }
+
+ return 0;
+}
+
+static int au1xtoy_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct au1xtoy_rtc *rtc = platform_get_drvdata(pdev);
+ unsigned long t;
+
+ rtc_tm_to_time(tm, &t);
+
+ if (mutex_lock_interruptible(&rtc->toycnt_lock))
+ return -ERESTARTSYS;
+
+ au_writel(t, SYS_TOYWRITE);
+ au_sync();
+
+ /* wait for the pending register write to succeed. This can
+ * take up to 6 seconds...
+ */
+ while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
+ schedule();
+
+ mutex_unlock(&rtc->toycnt_lock);
+
+ return 0;
+}
+
+static struct rtc_class_ops au1xtoy_rtc_ops = {
+ .read_time = au1xtoy_rtc_read_time,
+ .set_time = au1xtoy_rtc_set_time,
+};
+
+static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev)
+{
+ struct au1xtoy_rtc *rtc;
+ unsigned long u, to;
+ int ret;
+
+ rtc = kzalloc(sizeof(struct au1xtoy_rtc), GFP_KERNEL);
+ if (unlikely(!rtc))
+ return -ENOMEM;
+
+ mutex_init(&rtc->toycnt_lock);
+
+ u = au_readl(SYS_COUNTER_CNTRL);
+ if (!(u & CNTR_OK)) {
+ dev_err(&pdev->dev, "counters not working; aborting.\n");
+ ret = -ENODEV;
+ goto out_err;
+ }
+
+ ret = -ETIMEDOUT;
+
+ /* set counter0 tickrate to 1Hz if necessary */
+ if (au_readl(SYS_TOYTRIM) != 32767) {
+ /* wait until hardware gives access to TRIM register */
+ to = 0x00100000;
+ while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && to--)
+ schedule();
+
+ if (!to) {
+ /* timed out waiting for register access; assume
+ * counters are unusable.
+ */
+ dev_err(&pdev->dev, "timeout waiting for access\n");
+ goto out_err;
+ }
+
+ /* set 1Hz TOY tick rate */
+ au_writel(32767, SYS_TOYTRIM);
+ au_sync();
+ }
+
+ /* wait until the hardware allows writes to the counter reg */
+ while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
+ schedule();
+
+ rtc->rtc_dev = rtc_device_register("rtc-au1xxx", &pdev->dev,
+ &au1xtoy_rtc_ops, THIS_MODULE);
+ if (IS_ERR(rtc->rtc_dev)) {
+ ret = PTR_ERR(rtc->rtc_dev);
+ goto out_err;
+ }
+
+ platform_set_drvdata(pdev, rtc);
+
+ return 0;
+
+out_err:
+ kfree(rtc);
+ return ret;
+}
+
+static int __devexit au1xtoy_rtc_remove(struct platform_device *pdev)
+{
+ struct au1xtoy_rtc *rtc = platform_get_drvdata(pdev);
+
+ if (likely(rtc->rtc_dev))
+ rtc_device_unregister(rtc->rtc_dev);
+
+ platform_set_drvdata(pdev, NULL);
+
+ kfree(rtc);
+
+ return 0;
+}
+
+static struct platform_driver au1xtoy_rtc_platform_driver = {
+ .driver = {
+ .name = "rtc-au1xxx",
+ .owner = THIS_MODULE,
+ },
+ .probe = au1xtoy_rtc_probe,
+ .remove = __devexit_p(au1xtoy_rtc_remove),
+};
+
+static int __init au1xtoy_rtc_init(void)
+{
+ return platform_driver_register(&au1xtoy_rtc_platform_driver);
+}
+
+static void __exit au1xtoy_rtc_exit(void)
+{
+ platform_driver_unregister(&au1xtoy_rtc_platform_driver);
+}
+
+module_init(au1xtoy_rtc_init);
+module_exit(au1xtoy_rtc_exit);
+
+MODULE_DESCRIPTION("Au1xxx TOY-counter-based RTC driver");
+MODULE_AUTHOR("Manuel Lauss");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:rtc-au1xxx");
--
1.6.0.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [rtc-linux] Re: [RFC PATCH] Au1xxx on-chip counter-as-RTC driver
2008-10-22 7:31 ` Manuel Lauss
@ 2008-10-28 10:17 ` Alessandro Zummo
2008-10-28 10:52 ` Manuel Lauss
0 siblings, 1 reply; 8+ messages in thread
From: Alessandro Zummo @ 2008-10-28 10:17 UTC (permalink / raw)
To: rtc-linux; +Cc: mano, Linux-MIPS, Kevin Hickey
On Wed, 22 Oct 2008 09:31:14 +0200
Manuel Lauss <mano@roarinelk.homelinux.net> wrote:
> Here's a slightly updated version which has been running on a DB1200
> demoboard for almost 2 months now. I received no feedback on the
> original, unfortunately.
>
> Thanks!
> Manuel Lauss
Hi Manuel,
I'd need some feedback from linux-mips, otherwise
I can only Sign-off for the entries in drivers/rtc .
Btw why are you using a lock? the rtc class core
already provides his own lock for the ops calls.
--
Best regards,
Alessandro Zummo,
Tower Technologies - Torino, Italy
http://www.towertech.it
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rtc-linux] Re: [RFC PATCH] Au1xxx on-chip counter-as-RTC driver
2008-10-28 10:17 ` [rtc-linux] " Alessandro Zummo
@ 2008-10-28 10:52 ` Manuel Lauss
2008-10-28 10:59 ` Alessandro Zummo
2008-11-05 0:53 ` Alessandro Zummo
0 siblings, 2 replies; 8+ messages in thread
From: Manuel Lauss @ 2008-10-28 10:52 UTC (permalink / raw)
To: Alessandro Zummo; +Cc: rtc-linux, Linux-MIPS, Kevin Hickey
Hi Alessandro,
On Tue, Oct 28, 2008 at 11:17:04AM +0100, Alessandro Zummo wrote:
> On Wed, 22 Oct 2008 09:31:14 +0200
> Manuel Lauss <mano@roarinelk.homelinux.net> wrote:
>
> > Here's a slightly updated version which has been running on a DB1200
> > demoboard for almost 2 months now. I received no feedback on the
> > original, unfortunately.
> >
> > Thanks!
> > Manuel Lauss
>
> Hi Manuel,
>
> I'd need some feedback from linux-mips, otherwise
> I can only Sign-off for the entries in drivers/rtc .
I stripped the alchemy board parts away from the patch; they can go in
through the mips tree at a later time.
> Btw why are you using a lock? the rtc class core
> already provides his own lock for the ops calls.
Didn't know that; I mostly looked at rtc-sh.c for guidance which also
uses its own locks.
New patch below.
Thanks!
Manuel Lauss
---
Subject: [PATCH] RTC: Au1000 On-Chip Counter0-as-RTC driver.
Simple driver which uses the Au1xxx Time-Of-Year counter (counter0)
as a 1Hz RTC.
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
---
drivers/rtc/Kconfig | 9 +++
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-au1xxx.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 171 insertions(+), 0 deletions(-)
create mode 100644 drivers/rtc/rtc-au1xxx.c
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 8abbb20..8431fda 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -604,6 +604,15 @@ config RTC_DRV_AT91SAM9_GPBR
will be used. The default of zero is normally OK to use, but
on some systems other software needs to use that register.
+config RTC_DRV_AU1XXX
+ tristate "Au1xxx TOY-as-RTC support"
+ depends on SOC_AU1X00
+ help
+ This driver uses Au1000 on-chip Counter0 as a Real Time Clock.
+
+ This driver can also be built as a module. If so, the module
+ will be called rtc-au1xxx.
+
config RTC_DRV_BFIN
tristate "Blackfin On-Chip RTC"
depends on BLACKFIN && !BF561
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index e9e8474..cc213ab 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -20,6 +20,7 @@ rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
obj-$(CONFIG_RTC_DRV_AT32AP700X)+= rtc-at32ap700x.o
obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o
+obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o
obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o
obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o
obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
new file mode 100644
index 0000000..62e5c9b
--- /dev/null
+++ b/drivers/rtc/rtc-au1xxx.c
@@ -0,0 +1,161 @@
+/*
+ * Au1xxx counter0 (aka Time-of-year counter) RTC interface driver.
+ *
+ * Copyright (C) 2008 Manuel Lauss <mano@roarinelk.homelinux.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+/* All current Au1xxx SoCs have 2 counters fed by an external 32.768 kHz
+ * crystal. Counter 0, which keeps counting during sleep/powerdown, is
+ * used to count seconds since the beginning of the unix epoch.
+ *
+ * The counters must be configured and enabled by bootloader/board code;
+ * no checks as to whether they really get a proper 32.768kHz clock are
+ * made.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <asm/mach-au1x00/au1000.h>
+
+/* 32kHz clock enabled and detected */
+#define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)
+
+static int au1xtoy_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+ unsigned long t;
+
+ t = au_readl(SYS_TOYREAD);
+
+ rtc_time_to_tm(t, tm);
+
+ if (rtc_valid_tm(tm) < 0) {
+ dev_err(dev, "invalid date stored in counter0\n");
+ rtc_time_to_tm(0, tm);
+ }
+
+ return 0;
+}
+
+static int au1xtoy_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+ unsigned long t;
+
+ rtc_tm_to_time(tm, &t);
+
+ au_writel(t, SYS_TOYWRITE);
+ au_sync();
+
+ /* wait for the pending register write to succeed. This can
+ * take up to 6 seconds...
+ */
+ while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
+ schedule();
+
+ return 0;
+}
+
+static struct rtc_class_ops au1xtoy_rtc_ops = {
+ .read_time = au1xtoy_rtc_read_time,
+ .set_time = au1xtoy_rtc_set_time,
+};
+
+static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev)
+{
+ struct rtc_device *rtcdev;
+ unsigned long t;
+ int ret;
+
+ t = au_readl(SYS_COUNTER_CNTRL);
+ if (!(t & CNTR_OK)) {
+ dev_err(&pdev->dev, "counters not working; aborting.\n");
+ ret = -ENODEV;
+ goto out_err;
+ }
+
+ ret = -ETIMEDOUT;
+
+ /* set counter0 tickrate to 1Hz if necessary */
+ if (au_readl(SYS_TOYTRIM) != 32767) {
+ /* wait until hardware gives access to TRIM register */
+ t = 0x00100000;
+ while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && t--)
+ schedule();
+
+ if (!t) {
+ /* timed out waiting for register access; assume
+ * counters are unusable.
+ */
+ dev_err(&pdev->dev, "timeout waiting for access\n");
+ goto out_err;
+ }
+
+ /* set 1Hz TOY tick rate */
+ au_writel(32767, SYS_TOYTRIM);
+ au_sync();
+ }
+
+ /* wait until the hardware allows writes to the counter reg */
+ while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
+ schedule();
+
+ rtcdev = rtc_device_register("rtc-au1xxx", &pdev->dev,
+ &au1xtoy_rtc_ops, THIS_MODULE);
+ if (IS_ERR(rtcdev)) {
+ ret = PTR_ERR(rtcdev);
+ goto out_err;
+ }
+
+ platform_set_drvdata(pdev, rtcdev);
+
+ return 0;
+
+out_err:
+ return ret;
+}
+
+static int __devexit au1xtoy_rtc_remove(struct platform_device *pdev)
+{
+ struct rtc_device *rtcdev = platform_get_drvdata(pdev);
+
+ if (likely(rtcdev))
+ rtc_device_unregister(rtcdev);
+
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
+}
+
+static struct platform_driver au1xtoy_rtc_platform_driver = {
+ .driver = {
+ .name = "rtc-au1xxx",
+ .owner = THIS_MODULE,
+ },
+ .probe = au1xtoy_rtc_probe,
+ .remove = __devexit_p(au1xtoy_rtc_remove),
+};
+
+static int __init au1xtoy_rtc_init(void)
+{
+ return platform_driver_register(&au1xtoy_rtc_platform_driver);
+}
+
+static void __exit au1xtoy_rtc_exit(void)
+{
+ platform_driver_unregister(&au1xtoy_rtc_platform_driver);
+}
+
+module_init(au1xtoy_rtc_init);
+module_exit(au1xtoy_rtc_exit);
+
+MODULE_DESCRIPTION("Au1xxx TOY-counter-based RTC driver");
+MODULE_AUTHOR("Manuel Lauss");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:rtc-au1xxx");
--
1.6.0.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [rtc-linux] Re: [RFC PATCH] Au1xxx on-chip counter-as-RTC driver
2008-10-28 10:52 ` Manuel Lauss
@ 2008-10-28 10:59 ` Alessandro Zummo
2008-11-05 0:53 ` Alessandro Zummo
1 sibling, 0 replies; 8+ messages in thread
From: Alessandro Zummo @ 2008-10-28 10:59 UTC (permalink / raw)
To: rtc-linux, Linux-MIPS, Kevin Hickey, Manuel Lauss
On Tue, 28 Oct 2008 11:52:20 +0100
Manuel Lauss <mano@roarinelk.homelinux.net> wrote:
> > I'd need some feedback from linux-mips, otherwise
> > I can only Sign-off for the entries in drivers/rtc .
>
> I stripped the alchemy board parts away from the patch; they can go in
> through the mips tree at a later time.
ok.
> > Btw why are you using a lock? the rtc class core
> > already provides his own lock for the ops calls.
>
> Didn't know that; I mostly looked at rtc-sh.c for guidance which also
> uses its own locks.
I think it's due to the interrupt handling in rtc-sh.
--
Best regards,
Alessandro Zummo,
Tower Technologies - Torino, Italy
http://www.towertech.it
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rtc-linux] Re: [RFC PATCH] Au1xxx on-chip counter-as-RTC driver
2008-10-28 10:52 ` Manuel Lauss
2008-10-28 10:59 ` Alessandro Zummo
@ 2008-11-05 0:53 ` Alessandro Zummo
2008-11-05 20:44 ` Manuel Lauss
1 sibling, 1 reply; 8+ messages in thread
From: Alessandro Zummo @ 2008-11-05 0:53 UTC (permalink / raw)
To: rtc-linux; +Cc: mano, Linux-MIPS, Kevin Hickey
On Tue, 28 Oct 2008 11:52:20 +0100
Manuel Lauss <mano@roarinelk.homelinux.net> wrote:
Hi Manuel, some more comments
> ---
> Subject: [PATCH] RTC: Au1000 On-Chip Counter0-as-RTC driver.
>
> Simple driver which uses the Au1xxx Time-Of-Year counter (counter0)
> as a 1Hz RTC.
>
> Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
> ---
> drivers/rtc/Kconfig | 9 +++
> drivers/rtc/Makefile | 1 +
> drivers/rtc/rtc-au1xxx.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 171 insertions(+), 0 deletions(-)
> create mode 100644 drivers/rtc/rtc-au1xxx.c
>
> diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
> index 8abbb20..8431fda 100644
> --- a/drivers/rtc/Kconfig
> +++ b/drivers/rtc/Kconfig
> @@ -604,6 +604,15 @@ config RTC_DRV_AT91SAM9_GPBR
> will be used. The default of zero is normally OK to use, but
> on some systems other software needs to use that register.
>
> +config RTC_DRV_AU1XXX
> + tristate "Au1xxx TOY-as-RTC support"
> + depends on SOC_AU1X00
> + help
> + This driver uses Au1000 on-chip Counter0 as a Real Time Clock.
> +
> + This driver can also be built as a module. If so, the module
> + will be called rtc-au1xxx.
> +
> config RTC_DRV_BFIN
> tristate "Blackfin On-Chip RTC"
> depends on BLACKFIN && !BF561
> diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
> index e9e8474..cc213ab 100644
> --- a/drivers/rtc/Makefile
> +++ b/drivers/rtc/Makefile
> @@ -20,6 +20,7 @@ rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
> obj-$(CONFIG_RTC_DRV_AT32AP700X)+= rtc-at32ap700x.o
> obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
> obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o
> +obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o
> obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o
> obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o
> obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o
> diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
> new file mode 100644
> index 0000000..62e5c9b
> --- /dev/null
> +++ b/drivers/rtc/rtc-au1xxx.c
> @@ -0,0 +1,161 @@
> +/*
> + * Au1xxx counter0 (aka Time-of-year counter) RTC interface driver.
> + *
> + * Copyright (C) 2008 Manuel Lauss <mano@roarinelk.homelinux.net>
> + *
> + * This file is subject to the terms and conditions of the GNU General Public
> + * License. See the file "COPYING" in the main directory of this archive
> + * for more details.
> + */
> +
> +/* All current Au1xxx SoCs have 2 counters fed by an external 32.768 kHz
> + * crystal. Counter 0, which keeps counting during sleep/powerdown, is
> + * used to count seconds since the beginning of the unix epoch.
> + *
> + * The counters must be configured and enabled by bootloader/board code;
> + * no checks as to whether they really get a proper 32.768kHz clock are
> + * made.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/kernel.h>
> +#include <linux/rtc.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +#include <linux/io.h>
> +#include <asm/mach-au1x00/au1000.h>
> +
> +/* 32kHz clock enabled and detected */
> +#define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)
> +
> +static int au1xtoy_rtc_read_time(struct device *dev, struct rtc_time *tm)
> +{
> + unsigned long t;
> +
> + t = au_readl(SYS_TOYREAD);
> +
> + rtc_time_to_tm(t, tm);
> +
> + if (rtc_valid_tm(tm) < 0) {
> + dev_err(dev, "invalid date stored in counter0\n");
> + rtc_time_to_tm(0, tm);
> + }
> +
> + return 0;
> +}
you should return an error if the date is invalid.
return rtc_valid_tm(tm) would do
> +static int au1xtoy_rtc_set_time(struct device *dev, struct rtc_time *tm)
> +{
> + unsigned long t;
> +
> + rtc_tm_to_time(tm, &t);
> +
> + au_writel(t, SYS_TOYWRITE);
> + au_sync();
> +
> + /* wait for the pending register write to succeed. This can
> + * take up to 6 seconds...
> + */
> + while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
> + schedule();
> +
> + return 0;
> +}
> +
> +static struct rtc_class_ops au1xtoy_rtc_ops = {
> + .read_time = au1xtoy_rtc_read_time,
> + .set_time = au1xtoy_rtc_set_time,
> +};
> +
> +static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev)
> +{
> + struct rtc_device *rtcdev;
> + unsigned long t;
> + int ret;
> +
> + t = au_readl(SYS_COUNTER_CNTRL);
> + if (!(t & CNTR_OK)) {
> + dev_err(&pdev->dev, "counters not working; aborting.\n");
> + ret = -ENODEV;
> + goto out_err;
> + }
> +
> + ret = -ETIMEDOUT;
> +
> + /* set counter0 tickrate to 1Hz if necessary */
> + if (au_readl(SYS_TOYTRIM) != 32767) {
> + /* wait until hardware gives access to TRIM register */
> + t = 0x00100000;
> + while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && t--)
> + schedule();
> +
> + if (!t) {
> + /* timed out waiting for register access; assume
> + * counters are unusable.
> + */
> + dev_err(&pdev->dev, "timeout waiting for access\n");
> + goto out_err;
> + }
> +
> + /* set 1Hz TOY tick rate */
> + au_writel(32767, SYS_TOYTRIM);
> + au_sync();
> + }
> +
> + /* wait until the hardware allows writes to the counter reg */
> + while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
> + schedule();
> +
> + rtcdev = rtc_device_register("rtc-au1xxx", &pdev->dev,
> + &au1xtoy_rtc_ops, THIS_MODULE);
> + if (IS_ERR(rtcdev)) {
> + ret = PTR_ERR(rtcdev);
> + goto out_err;
> + }
> +
> + platform_set_drvdata(pdev, rtcdev);
> +
> + return 0;
> +
> +out_err:
> + return ret;
> +}
> +
> +static int __devexit au1xtoy_rtc_remove(struct platform_device *pdev)
> +{
> + struct rtc_device *rtcdev = platform_get_drvdata(pdev);
> +
> + if (likely(rtcdev))
no need to check
> + rtc_device_unregister(rtcdev);
> +
> + platform_set_drvdata(pdev, NULL);
> + return 0;
> +}
> +
> +static struct platform_driver au1xtoy_rtc_platform_driver = {
> + .driver = {
> + .name = "rtc-au1xxx",
> + .owner = THIS_MODULE,
> + },
> + .probe = au1xtoy_rtc_probe,
> + .remove = __devexit_p(au1xtoy_rtc_remove),
> +};
> +
> +static int __init au1xtoy_rtc_init(void)
> +{
> + return platform_driver_register(&au1xtoy_rtc_platform_driver);
you should be using platform_driver_probe here which will require
__init/__exit instead of __devinit __devexit
> +}
> +
> +static void __exit au1xtoy_rtc_exit(void)
> +{
> + platform_driver_unregister(&au1xtoy_rtc_platform_driver);
> +}
> +
> +module_init(au1xtoy_rtc_init);
> +module_exit(au1xtoy_rtc_exit);
> +
> +MODULE_DESCRIPTION("Au1xxx TOY-counter-based RTC driver");
> +MODULE_AUTHOR("Manuel Lauss");
email here please
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:rtc-au1xxx");
> --
> 1.6.0.2
>
>
> --~--~---------~--~----~------------~-------~--~----~
> You received this message because you are subscribed to "rtc-linux".
> Membership options at http://groups.google.com/group/rtc-linux .
> Please read http://groups.google.com/group/rtc-linux/web/checklist
> before submitting a driver.
> -~----------~----~----~----~------~----~------~--~---
>
--
Best regards,
Alessandro Zummo,
Tower Technologies - Torino, Italy
http://www.towertech.it
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rtc-linux] Re: [RFC PATCH] Au1xxx on-chip counter-as-RTC driver
2008-11-05 0:53 ` Alessandro Zummo
@ 2008-11-05 20:44 ` Manuel Lauss
0 siblings, 0 replies; 8+ messages in thread
From: Manuel Lauss @ 2008-11-05 20:44 UTC (permalink / raw)
To: Alessandro Zummo; +Cc: rtc-linux, Linux-MIPS, Kevin Hickey
Hi Alessandro,
On Wed, Nov 05, 2008 at 01:53:53AM +0100, Alessandro Zummo wrote:
> On Tue, 28 Oct 2008 11:52:20 +0100
> Manuel Lauss <mano@roarinelk.homelinux.net> wrote:
>
> Hi Manuel, some more comments
>
> > +static int au1xtoy_rtc_read_time(struct device *dev, struct rtc_time *tm)
> > +{
> > + unsigned long t;
> > +
> > + t = au_readl(SYS_TOYREAD);
> > +
> > + rtc_time_to_tm(t, tm);
> > +
> > + if (rtc_valid_tm(tm) < 0) {
> > + dev_err(dev, "invalid date stored in counter0\n");
> > + rtc_time_to_tm(0, tm);
> > + }
> > +
> > + return 0;
> > +}
>
>
> you should return an error if the date is invalid.
> return rtc_valid_tm(tm) would do
>
>
> > +static int __devexit au1xtoy_rtc_remove(struct platform_device *pdev)
> > +{
> > + struct rtc_device *rtcdev = platform_get_drvdata(pdev);
> > +
> > + if (likely(rtcdev))
>
> no need to check
>
> > + rtc_device_unregister(rtcdev);
> > +
> > + platform_set_drvdata(pdev, NULL);
> > + return 0;
> > +}
> > +
> > +static struct platform_driver au1xtoy_rtc_platform_driver = {
> > + .driver = {
> > + .name = "rtc-au1xxx",
> > + .owner = THIS_MODULE,
> > + },
> > + .probe = au1xtoy_rtc_probe,
> > + .remove = __devexit_p(au1xtoy_rtc_remove),
> > +};
> > +
> > +static int __init au1xtoy_rtc_init(void)
> > +{
> > + return platform_driver_register(&au1xtoy_rtc_platform_driver);
>
> you should be using platform_driver_probe here which will require
> __init/__exit instead of __devinit __devexit
>
> > +}
> > +
> > +static void __exit au1xtoy_rtc_exit(void)
> > +{
> > + platform_driver_unregister(&au1xtoy_rtc_platform_driver);
> > +}
> > +
> > +module_init(au1xtoy_rtc_init);
> > +module_exit(au1xtoy_rtc_exit);
> > +
> > +MODULE_DESCRIPTION("Au1xxx TOY-counter-based RTC driver");
> > +MODULE_AUTHOR("Manuel Lauss");
>
> email here please
All fixed, new version below.
Thank you!
Manuel Lauss
---
From: Manuel Lauss <mano@roarinelk.homelinux.net>
Subject: [PATCH] RTC: Au1000 On-Chip Counter0-as-RTC driver.
Simple driver which uses the Au1xxx Time-Of-Year counter (counter0)
as a 1Hz RTC.
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
---
drivers/rtc/Kconfig | 9 +++
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-au1xxx.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 163 insertions(+), 0 deletions(-)
create mode 100644 drivers/rtc/rtc-au1xxx.c
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 8abbb20..8431fda 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -604,6 +604,15 @@ config RTC_DRV_AT91SAM9_GPBR
will be used. The default of zero is normally OK to use, but
on some systems other software needs to use that register.
+config RTC_DRV_AU1XXX
+ tristate "Au1xxx TOY-as-RTC support"
+ depends on SOC_AU1X00
+ help
+ This driver uses Au1000 on-chip Counter0 as a Real Time Clock.
+
+ This driver can also be built as a module. If so, the module
+ will be called rtc-au1xxx.
+
config RTC_DRV_BFIN
tristate "Blackfin On-Chip RTC"
depends on BLACKFIN && !BF561
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index e9e8474..cc213ab 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -20,6 +20,7 @@ rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
obj-$(CONFIG_RTC_DRV_AT32AP700X)+= rtc-at32ap700x.o
obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o
obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o
+obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o
obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o
obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o
obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
new file mode 100644
index 0000000..d94974d
--- /dev/null
+++ b/drivers/rtc/rtc-au1xxx.c
@@ -0,0 +1,153 @@
+/*
+ * Au1xxx counter0 (aka Time-of-year counter) RTC interface driver.
+ *
+ * Copyright (C) 2008 Manuel Lauss <mano@roarinelk.homelinux.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+/* All current Au1xxx SoCs have 2 counters fed by an external 32.768 kHz
+ * crystal. Counter 0, which keeps counting during sleep/powerdown, is
+ * used to count seconds since the beginning of the unix epoch.
+ *
+ * The counters must be configured and enabled by bootloader/board code;
+ * no checks as to whether they really get a proper 32.768kHz clock are
+ * made.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/rtc.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <asm/mach-au1x00/au1000.h>
+
+/* 32kHz clock enabled and detected */
+#define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S)
+
+static int au1xtoy_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+ unsigned long t;
+
+ t = au_readl(SYS_TOYREAD);
+
+ rtc_time_to_tm(t, tm);
+
+ return rtc_valid_tm(tm);
+}
+
+static int au1xtoy_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+ unsigned long t;
+
+ rtc_tm_to_time(tm, &t);
+
+ au_writel(t, SYS_TOYWRITE);
+ au_sync();
+
+ /* wait for the pending register write to succeed. This can
+ * take up to 6 seconds...
+ */
+ while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
+ schedule();
+
+ return 0;
+}
+
+static struct rtc_class_ops au1xtoy_rtc_ops = {
+ .read_time = au1xtoy_rtc_read_time,
+ .set_time = au1xtoy_rtc_set_time,
+};
+
+static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev)
+{
+ struct rtc_device *rtcdev;
+ unsigned long t;
+ int ret;
+
+ t = au_readl(SYS_COUNTER_CNTRL);
+ if (!(t & CNTR_OK)) {
+ dev_err(&pdev->dev, "counters not working; aborting.\n");
+ ret = -ENODEV;
+ goto out_err;
+ }
+
+ ret = -ETIMEDOUT;
+
+ /* set counter0 tickrate to 1Hz if necessary */
+ if (au_readl(SYS_TOYTRIM) != 32767) {
+ /* wait until hardware gives access to TRIM register */
+ t = 0x00100000;
+ while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && t--)
+ schedule();
+
+ if (!t) {
+ /* timed out waiting for register access; assume
+ * counters are unusable.
+ */
+ dev_err(&pdev->dev, "timeout waiting for access\n");
+ goto out_err;
+ }
+
+ /* set 1Hz TOY tick rate */
+ au_writel(32767, SYS_TOYTRIM);
+ au_sync();
+ }
+
+ /* wait until the hardware allows writes to the counter reg */
+ while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S)
+ schedule();
+
+ rtcdev = rtc_device_register("rtc-au1xxx", &pdev->dev,
+ &au1xtoy_rtc_ops, THIS_MODULE);
+ if (IS_ERR(rtcdev)) {
+ ret = PTR_ERR(rtcdev);
+ goto out_err;
+ }
+
+ platform_set_drvdata(pdev, rtcdev);
+
+ return 0;
+
+out_err:
+ return ret;
+}
+
+static int __devexit au1xtoy_rtc_remove(struct platform_device *pdev)
+{
+ struct rtc_device *rtcdev = platform_get_drvdata(pdev);
+
+ rtc_device_unregister(rtcdev);
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
+}
+
+static struct platform_driver au1xrtc_driver = {
+ .driver = {
+ .name = "rtc-au1xxx",
+ .owner = THIS_MODULE,
+ },
+ .remove = __devexit_p(au1xtoy_rtc_remove),
+};
+
+static int __init au1xtoy_rtc_init(void)
+{
+ return platform_driver_probe(&au1xrtc_driver, au1xtoy_rtc_probe);
+}
+
+static void __exit au1xtoy_rtc_exit(void)
+{
+ platform_driver_unregister(&au1xrtc_driver);
+}
+
+module_init(au1xtoy_rtc_init);
+module_exit(au1xtoy_rtc_exit);
+
+MODULE_DESCRIPTION("Au1xxx TOY-counter-based RTC driver");
+MODULE_AUTHOR("Manuel Lauss <manuel.lauss@gmail.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:rtc-au1xxx");
--
1.6.0.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-11-05 20:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-09 14:14 [RFC PATCH] Au1xxx on-chip counter-as-RTC driver Manuel Lauss
2008-10-21 18:38 ` [rtc-linux] " Alessandro Zummo
2008-10-22 7:31 ` Manuel Lauss
2008-10-28 10:17 ` [rtc-linux] " Alessandro Zummo
2008-10-28 10:52 ` Manuel Lauss
2008-10-28 10:59 ` Alessandro Zummo
2008-11-05 0:53 ` Alessandro Zummo
2008-11-05 20:44 ` Manuel Lauss
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.