[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-9079b35364e75ce6b968a179f861d2f819f33e61@git.kernel.org>
Date: Wed, 23 Feb 2011 21:51:55 GMT
From: tip-bot for Sebastian Andrzej Siewior <bigeasy@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, grant.likely@...retlab.ca,
hpa@...or.com, mingo@...hat.com, dirk.brandewie@...il.com,
bigeasy@...utronix.de, tglx@...utronix.de
Subject: [tip:x86/platform] x86: dtb: Add generic bus probe
Commit-ID: 9079b35364e75ce6b968a179f861d2f819f33e61
Gitweb: http://git.kernel.org/tip/9079b35364e75ce6b968a179f861d2f819f33e61
Author: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
AuthorDate: Tue, 22 Feb 2011 21:07:43 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 23 Feb 2011 22:27:54 +0100
x86: dtb: Add generic bus probe
For now we probe these busses and we change this to board dependent
probes once we have to.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Signed-off-by: Dirk Brandewie <dirk.brandewie@...il.com>
Acked-by: Grant Likely <grant.likely@...retlab.ca>
Cc: sodaville@...utronix.de
Cc: devicetree-discuss@...ts.ozlabs.org
LKML-Reference: <1298405266-1624-9-git-send-email-bigeasy@...utronix.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/x86/kernel/devicetree.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 7b57422..0bc83bf 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -103,6 +103,25 @@ void __init add_dtb(u64 data)
initial_dtb = data + offsetof(struct setup_data, data);
}
+/*
+ * CE4100 ids. Will be moved to machine_device_initcall() once we have it.
+ */
+static struct of_device_id __initdata ce4100_ids[] = {
+ { .compatible = "intel,ce4100-cp", },
+ { .compatible = "isa", },
+ { .compatible = "pci", },
+ {},
+};
+
+static int __init add_bus_probe(void)
+{
+ if (!initial_boot_params)
+ return 0;
+
+ return of_platform_bus_probe(NULL, ce4100_ids, NULL);
+}
+module_init(add_bus_probe);
+
#ifdef CONFIG_PCI
static int x86_of_pci_irq_enable(struct pci_dev *dev)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists