[PATCH OF 12/14] x86/rtc: don't register rtc if we the DT blob
From: Sebastian Andrzej Siewior <hidden>
Date: 2011-01-24 04:29:57
Also in:
lkml
Subsystem:
open firmware and flattened device tree, the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Rob Herring, Saravana Kannan, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
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; platform_device_register(&rtc_device); dev_info(&rtc_device.dev,
diff --git a/include/linux/of.h b/include/linux/of.h
index cad7cf0..016968d 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h@@ -70,6 +70,11 @@ extern struct device_node *allnodes; extern struct device_node *of_chosen; extern rwlock_t devtree_lock; +static inline int of_have_populated_dt(void) +{ + return allnodes != NULL; +} + static inline bool of_node_is_root(const struct device_node *node) { return node && (node->parent == NULL);
@@ -222,5 +227,12 @@ extern void of_attach_node(struct device_node *); extern void of_detach_node(struct device_node *); #endif +#else + +static inline int of_have_populated_dt(void) +{ + return 0; +} + #endif /* CONFIG_OF */ #endif /* _LINUX_OF_H */
--
1.7.3.2