summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/devicetree.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2011-02-24 09:52:42 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-24 13:01:59 +0100
commit4a66b1d95ad8baf6ab884a1c64461449b463eb78 (patch)
tree3ae4a1ceb22c69f787bc30f9fa1b9a45b8b29a56 /arch/x86/kernel/devicetree.c
parent3bcbaf6e08d8d82cde781997bd2c56dda87049b5 (diff)
x86: dt: Fix OLPC=y/INTEL_CE=n build
Both OLPC and CE4100 activate CONFIG_OF. OLPC uses PROMTREE while CE uses FLATTREE. Compiling for OLPC only breaks due to missing flat tree functions and variables. Use proper wrappers and provide an empty x86_flattree_get_config() inline so OF=y FLATTREE=n builds and works. [ tglx: Make it work with HPET_TIMER=n and make a function static ] Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/devicetree.c')
-rw-r--r--arch/x86/kernel/devicetree.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 2d65897a39d0..06e5e91939c5 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -26,7 +26,7 @@ static DEFINE_RAW_SPINLOCK(big_irq_lock);
int __initdata of_ioapic;
-void add_interrupt_host(struct irq_domain *ih)
+static void add_interrupt_host(struct irq_domain *ih)
{
unsigned long flags;
@@ -115,7 +115,7 @@ static struct of_device_id __initdata ce4100_ids[] = {
static int __init add_bus_probe(void)
{
- if (!initial_boot_params)
+ if (!of_have_populated_dt())
return 0;
return of_platform_bus_probe(NULL, ce4100_ids, NULL);
@@ -203,6 +203,7 @@ void __cpuinit x86_of_pci_init(void)
static void __init dtb_setup_hpet(void)
{
+#ifdef CONFIG_HPET_TIMER
struct device_node *dn;
struct resource r;
int ret;
@@ -216,6 +217,7 @@ static void __init dtb_setup_hpet(void)
return;
}
hpet_address = r.start;
+#endif
}
static void __init dtb_lapic_setup(void)
@@ -288,7 +290,8 @@ void __init x86_dtb_find_config(void)
printk(KERN_ERR "Missing device tree!.\n");
}
-void __init x86_dtb_get_config(unsigned int unused)
+#ifdef CONFIG_OF_FLATTREE
+static void __init x86_flattree_get_config(void)
{
u32 size, map_len;
void *new_dtb;
@@ -317,6 +320,18 @@ void __init x86_dtb_get_config(unsigned int unused)
of_scan_flat_dt(early_init_dt_scan_root, NULL);
unflatten_device_tree();
+}
+#else
+static inline void x86_flattree_get_config(void) { }
+#endif
+
+void __init x86_dtb_get_config(unsigned int unused)
+{
+ x86_flattree_get_config();
+
+ if (!of_have_populated_dt())
+ return;
+
dtb_setup_hpet();
dtb_apic_setup();
}
@@ -413,7 +428,7 @@ void __init x86_add_irq_domains(void)
{
struct device_node *dp;
- if (!initial_boot_params)
+ if (!of_have_populated_dt())
return;
for_each_node_with_property(dp, "interrupt-controller") {