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>
Subject: [PATCH 13/15] x86/rtc: don't register rtc if we have an OF node for it
Date: Fri, 17 Dec 2010 16:33:51 +0100	[thread overview]
Message-ID: <1292600033-12271-14-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1292600033-12271-1-git-send-email-bigeasy@linutronix.de>

or we end up with two of those things.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 arch/x86/kernel/rtc.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 1cfbbfc..382c6cb 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -6,6 +6,7 @@
 #include <linux/acpi.h>
 #include <linux/bcd.h>
 #include <linux/pnp.h>
+#include <linux/of.h>
 
 #include <asm/vsyscall.h>
 #include <asm/x86_init.h>
@@ -218,6 +219,25 @@ static struct platform_device rtc_device = {
 	.num_resources	= ARRAY_SIZE(rtc_resources),
 };
 
+#ifdef CONFIG_OF
+static __init int have_rtc_of_node(void)
+{
+	struct device_node *n;
+
+	n = of_find_compatible_node(NULL, NULL, "motorola,mc146818");
+	if (n) {
+		of_node_put(n);
+		return 1;
+	}
+	return 0;
+}
+#else
+static inline int have_rtc_of_node(void)
+{
+	return 0;
+}
+#endif
+
 static __init int add_rtc_cmos(void)
 {
 #ifdef CONFIG_PNP
@@ -237,6 +257,9 @@ static __init int add_rtc_cmos(void)
 	}
 #endif
 
+	if (have_rtc_of_node())
+		return 0;
+
 	platform_device_register(&rtc_device);
 	dev_info(&rtc_device.dev,
 		 "registered platform RTC device (no PNP device found)\n");
-- 
1.7.3.2


  parent reply	other threads:[~2010-12-17 15:34 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 ` Sebastian Andrzej Siewior [this message]
2010-12-30  8:59   ` [PATCH 13/15] x86/rtc: don't register rtc if we have an OF node for it 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 ` [PATCH 14/15] rtc/cmos: add OF bindings Sebastian Andrzej Siewior
2011-01-12  0:04   ` 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-14-git-send-email-bigeasy@linutronix.de \
    --to=bigeasy@linutronix.de \
    --cc=dirk.brandewie@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --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®