Thread (50 messages) 50 messages, 5 authors, 2011-02-22

Re: [PATCH OF 12/14] x86/rtc: don't register rtc if we the DT blob

From: Grant Likely <hidden>
Date: 2011-02-16 22:09:26
Also in: lkml

On Mon, Jan 24, 2011 at 09:59:00AM +0530, Sebastian Andrzej Siewior wrote:
quoted hunk ↗ jump to hunk
or we might end up with two device nodes for the same hardware.

Cc: Andres Salomon <redacted>
Signed-off-by: Sebastian Andrzej Siewior <redacted>
---
 arch/x86/kernel/rtc.c |    3 +++
 include/linux/of.h    |   12 ++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 6f39cab..3f2ad26 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>
@@ -236,6 +237,8 @@ static __init int add_rtc_cmos(void)
 		}
 	}
 #endif
+	if (of_have_populated_dt())
+		return 0;
Hmmm, should this hunk be moved to the next patch to preserve bisectability?

g.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help