mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: sodaville@linutronix.de, x86@kernel.org,
	dirk.brandewie@gmail.com,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	rtc-linux@googlegroups.com,
	Alessandro Zummo <a.zummo@towertech.it>,
	devicetree-discuss@lists.ozlabs.org
Subject: [PATCH 14/15] rtc/cmos: add OF bindings
Date: Fri, 17 Dec 2010 16:33:52 +0100	[thread overview]
Message-ID: <1292600033-12271-15-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1292600033-12271-1-git-send-email-bigeasy@linutronix.de>

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


  parent reply	other threads:[~2010-12-17 15:35 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-17 15:33 Add device tree support for x86, v2 Sebastian Andrzej Siewior
2010-12-17 15:33 ` [PATCH 01/15] x86/e820: remove conditional early mapping in parse_e820_ext Sebastian Andrzej Siewior
2010-12-30  8:37   ` Grant Likely
2011-01-04 13:08     ` [PATCH v2 " Sebastian Andrzej Siewior
2011-01-14  8:14       ` Grant Likely
2011-01-14 10:57         ` Sebastian Andrzej Siewior
2011-01-14 21:43           ` Andres Salomon
2011-01-27 19:54             ` Daniel Drake
2011-02-01 13:21               ` Sebastian Andrzej Siewior
2011-02-01 18:36                 ` Andres Salomon
2011-02-02  3:10                   ` Grant Likely
2011-02-02 16:22                     ` Sebastian Andrzej Siewior
2011-02-03 18:40                     ` Andres Salomon
2011-02-03 19:44                       ` [sodaville] " H. Peter Anvin
2011-02-03 20:09                         ` Andres Salomon
2011-02-03 20:16                           ` H. Peter Anvin
2011-02-03 20:39                             ` Andres Salomon
2011-02-03 21:04                               ` H. Peter Anvin
2011-02-02 18:59               ` H. Peter Anvin
2010-12-17 15:33 ` [PATCH 02/15] x86: Add device tree support Sebastian Andrzej Siewior
2010-12-30  8:43   ` Grant Likely
2010-12-30 21:01     ` Grant Likely
2011-01-02  0:40       ` H. Peter Anvin
2011-01-03 12:20     ` Sebastian Andrzej Siewior
2011-01-03 18:05       ` [sodaville] " H. Peter Anvin
2010-12-17 15:33 ` [PATCH 03/15] x86/dtb: Add a device tree for CE4100 Sebastian Andrzej Siewior
2010-12-30  8:51   ` Grant Likely
2011-01-03 11:28     ` Sebastian Andrzej Siewior
2011-01-03 17:45       ` Grant Likely
2011-01-05  9:48         ` [PATCH v2 " Sebastian Andrzej Siewior
2011-01-05 10:01     ` [PATCH " Sebastian Andrzej Siewior
2011-01-05 23:20     ` David Gibson
2010-12-17 15:33 ` [PATCH 04/15] x86/dtb: add irq domain abstraction Sebastian Andrzej Siewior
2011-01-11 22:03   ` Grant Likely
2011-01-23 13:06     ` Sebastian Andrzej Siewior
2010-12-17 15:33 ` [PATCH 05/15] x86/dtb: add early parsing of APIC and IO APIC Sebastian Andrzej Siewior
2010-12-30  8:54   ` Grant Likely
2011-01-04 13:23     ` [PATCH v2 " Sebastian Andrzej Siewior
2011-01-11 22:14       ` Grant Likely
2011-01-18 14:56         ` Sebastian Andrzej Siewior
2010-12-17 15:33 ` [PATCH 06/15] x86/dtb: add support hpet Sebastian Andrzej Siewior
2011-01-11 22:26   ` Grant Likely
2010-12-17 15:33 ` [PATCH 07/15] of: move of_irq_map_pci() into generic code Sebastian Andrzej Siewior
2010-12-17 21:16   ` Benjamin Herrenschmidt
2011-01-04 14:27     ` [PATCH v2 " Sebastian Andrzej Siewior
2011-01-11 23:27       ` Grant Likely
2011-01-12 18:21         ` Sebastian Andrzej Siewior
2010-12-17 15:33 ` [PATCH 08/15] x86/dtb: add support for PCI devices backed by dtb nodes Sebastian Andrzej Siewior
2011-01-11 23:47   ` Grant Likely
2010-12-17 15:33 ` [PATCH 09/15] x86/dtb: Add generic bus probe Sebastian Andrzej Siewior
2011-01-11 23:48   ` Grant Likely
2010-12-17 15:33 ` [PATCH 10/15] x86/ioapic: Add OF bindings for IO-APIC Sebastian Andrzej Siewior
2011-01-11 23:53   ` Grant Likely
2011-01-12 17:07     ` Sebastian Andrzej Siewior
2011-01-12 17:19       ` [sodaville] " H. Peter Anvin
2011-01-13 10:38         ` Sebastian Andrzej Siewior
2010-12-17 15:33 ` [PATCH 11/15] x86/ce4100: use OF for ioapic Sebastian Andrzej Siewior
2011-01-11 23:54   ` Grant Likely
2010-12-17 15:33 ` [PATCH 12/15] of/address: use propper endianess in get_flags Sebastian Andrzej Siewior
2010-12-30  9:05   ` Grant Likely
2010-12-17 15:33 ` [PATCH 13/15] x86/rtc: don't register rtc if we have an OF node for it Sebastian Andrzej Siewior
2010-12-30  8:59   ` Grant Likely
2011-01-04 13:28     ` [PATCH v2 13/15] x86/rtc: don't register rtc if we the DT blob Sebastian Andrzej Siewior
2011-01-12  0:02       ` Grant Likely
2011-01-12 18:29         ` Sebastian Andrzej Siewior
2011-01-14 22:16           ` Grant Likely
2010-12-17 15:33 ` Sebastian Andrzej Siewior [this message]
2011-01-12  0:04   ` [PATCH 14/15] rtc/cmos: add OF bindings Grant Likely
2011-01-13 10:50     ` [PATCH v2] " Sebastian Andrzej Siewior
2010-12-17 15:33 ` [PATCH 15/15] x86/pci: remove warning Sebastian Andrzej Siewior
2011-02-18 16:06   ` [tip:x86/platform] x86/pci: Remove unused variable tip-bot for Sebastian Andrzej Siewior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1292600033-12271-15-git-send-email-bigeasy@linutronix.de \
    --to=bigeasy@linutronix.de \
    --cc=a.zummo@towertech.it \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=dirk.brandewie@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rtc-linux@googlegroups.com \
    --cc=sodaville@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®