[PATCH 14/15] rtc/cmos: add OF bindings

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Sebastian Andrzej Siewior
Date: Friday, December 17, 2010 - 8:33 am

This allows to load the OF driver based informations from the device
tree. Systems without BIOS may need to perform some initialization.
PowerPC creates a PNP device from the OF information and performs this
kind of initialization in their private PCI quirk. This looks more
generic.

Cc: rtc-linux@googlegroups.com
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
---
 Documentation/powerpc/dts-bindings/rtc-cmos.txt |   28 ++++++++++++++++
 drivers/rtc/rtc-cmos.c                          |   40 +++++++++++++++++++++++
 2 files changed, 68 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/powerpc/dts-bindings/rtc-cmos.txt

diff --git a/Documentation/powerpc/dts-bindings/rtc-cmos.txt b/Documentation/powerpc/dts-bindings/rtc-cmos.txt
new file mode 100644
index 0000000..7382989
--- /dev/null
+++ b/Documentation/powerpc/dts-bindings/rtc-cmos.txt
@@ -0,0 +1,28 @@
+ Motorola mc146818 compatible RTC
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Required properties:
+  - compatible : "motorola,mc146818"
+  - reg : should contain registers location and length.
+
+Optional properties:
+  - interrupts : should contain interrupt.
+  - interrupt-parent : interrupt source phandle.
+  - ctrl-reg : Contains the initial value of the control register also
+    called "Register B".
+  - freq-reg : Contains the initial value of the frequency register also
+    called "Regsiter A".
+
+"Register A" and "B" are usually initialized by the firmware (BIOS for
+instance). If this is not done, it can be performed by the driver.
+
+ISA Example:
+
+	rtc@70 {
+	         compatible = "motorola,mc146818";
+	         interrupts = <8 3>;
+	         interrupt-parent = <&ioapic1>;
+	         ctrl-reg = <2>;
+	         freq-reg = <0x26>;
+	         reg = <1 0x70 2>;
+	 };
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 5856167..8cf0049 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -36,6 +36,8 @@
 #include <linux/platform_device.h>
 #include <linux/mod_devicetable.h>
 #include <linux/log2.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
 
 /* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
 #include <asm-generic/rtc.h>
@@ -1121,6 +1123,15 @@ static struct pnp_driver cmos_pnp_driver = {
 
 #endif	/* CONFIG_PNP */
 
+#ifdef CONFIG_OF
+static const struct of_device_id of_cmos_match[] = {
+	{
+		.compatible = "motorola,mc146818",
+	},
+	{ },
+};
+MODULE_DEVICE_TABLE(of, of_cmos_match);
+#endif
 /*----------------------------------------------------------------*/
 
 /* Platform setup should have set up an RTC device, when PNP is
@@ -1129,6 +1140,32 @@ static struct pnp_driver cmos_pnp_driver = {
 
 static int __init cmos_platform_probe(struct platform_device *pdev)
 {
+#ifdef CONFIG_OF
+	if (pdev->dev.of_node) {
+		struct device_node *node = pdev->dev.of_node;
+		struct rtc_time time;
+		int ret;
+		const __be32 *val;
+
+		val = of_get_property(node, "ctrl-reg", NULL);
+		if (val)
+			CMOS_WRITE(be32_to_cpup(val), RTC_CONTROL);
+
+		val = of_get_property(node, "freq-reg", NULL);
+		if (val)
+			CMOS_WRITE(be32_to_cpup(val), RTC_FREQ_SELECT);
+
+		get_rtc_time(&time);
+		ret = rtc_valid_tm(&time);
+		if (ret) {
+			struct rtc_time def_time = {
+				.tm_year = 1,
+				.tm_mday = 1,
+			};
+			set_rtc_time(&def_time);
+		}
+	}
+#endif
 	cmos_wake_setup(&pdev->dev);
 	return cmos_do_probe(&pdev->dev,
 			platform_get_resource(pdev, IORESOURCE_IO, 0),
@@ -1157,6 +1194,9 @@ static struct platform_driver cmos_platform_driver = {
 	.shutdown	= cmos_platform_shutdown,
 	.driver = {
 		.name		= (char *) driver_name,
+#if defined(CONFIG_OF)
+		.of_match_table = of_cmos_match,
+#endif
 		.suspend	= cmos_suspend,
 		.resume		= cmos_resume,
 	}
-- 
1.7.3.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Add device tree support for x86, v2, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 01/15] x86/e820: remove conditional early mapping i ..., Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 02/15] x86: Add device tree support, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 03/15] x86/dtb: Add a device tree for CE4100, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 04/15] x86/dtb: add irq domain abstraction, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 05/15] x86/dtb: add early parsing of APIC and IO APIC, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 06/15] x86/dtb: add support hpet, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 07/15] of: move of_irq_map_pci() into generic code, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 08/15] x86/dtb: add support for PCI devices backed ..., Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 09/15] x86/dtb: Add generic bus probe, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 10/15] x86/ioapic: Add OF bindings for IO-APIC, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 11/15] x86/ce4100: use OF for ioapic, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 12/15] of/address: use propper endianess in get_flags, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 13/15] x86/rtc: don't register rtc if we have an OF ..., Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 14/15] rtc/cmos: add OF bindings, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
[PATCH 15/15] x86/pci: remove warning, Sebastian Andrzej Si ..., (Fri Dec 17, 8:33 am)
Re: [PATCH 07/15] of: move of_irq_map_pci() into generic code, Benjamin Herrenschmidt, (Fri Dec 17, 2:16 pm)
Re: [PATCH 02/15] x86: Add device tree support, Grant Likely, (Thu Dec 30, 1:43 am)
Re: [PATCH 03/15] x86/dtb: Add a device tree for CE4100, Grant Likely, (Thu Dec 30, 1:51 am)
Re: [PATCH 02/15] x86: Add device tree support, Grant Likely, (Thu Dec 30, 2:01 pm)
Re: [PATCH 02/15] x86: Add device tree support, H. Peter Anvin, (Sat Jan 1, 5:40 pm)
Re: [PATCH 03/15] x86/dtb: Add a device tree for CE4100, Sebastian Andrzej Si ..., (Mon Jan 3, 4:28 am)
Re: [PATCH 02/15] x86: Add device tree support, Sebastian Andrzej Si ..., (Mon Jan 3, 5:20 am)
Re: [PATCH 03/15] x86/dtb: Add a device tree for CE4100, Grant Likely, (Mon Jan 3, 10:45 am)
Re: [sodaville] [PATCH 02/15] x86: Add device tree support, H. Peter Anvin, (Mon Jan 3, 11:05 am)
[PATCH v2 01/15] x86/e820: remove conditional early mappin ..., Sebastian Andrzej Si ..., (Tue Jan 4, 6:08 am)
[PATCH v2 05/15] x86/dtb: add early parsing of APIC and IO ..., Sebastian Andrzej Si ..., (Tue Jan 4, 6:23 am)
[PATCH v2 13/15] x86/rtc: don't register rtc if we the DT blob, Sebastian Andrzej Si ..., (Tue Jan 4, 6:28 am)
[PATCH v2 07/15] of: move of_irq_map_pci() into generic code, Sebastian Andrzej Si ..., (Tue Jan 4, 7:27 am)