diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2011-02-22 15:07:43 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 16:27:54 -0500 |
commit | 9079b35364e75ce6b968a179f861d2f819f33e61 (patch) | |
tree | 20a8e59813f379f22d8a32f659506ad82f539a4a | |
parent | 96e0a0797eba35b5420c710b928f19094b2d5c45 (diff) |
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@linutronix.de>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: sodaville@linutronix.de
Cc: devicetree-discuss@lists.ozlabs.org
LKML-Reference: <1298405266-1624-9-git-send-email-bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | 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 7b574226e0a8..0bc83bfa4ead 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c | |||
@@ -103,6 +103,25 @@ void __init add_dtb(u64 data) | |||
103 | initial_dtb = data + offsetof(struct setup_data, data); | 103 | initial_dtb = data + offsetof(struct setup_data, data); |
104 | } | 104 | } |
105 | 105 | ||
106 | /* | ||
107 | * CE4100 ids. Will be moved to machine_device_initcall() once we have it. | ||
108 | */ | ||
109 | static struct of_device_id __initdata ce4100_ids[] = { | ||
110 | { .compatible = "intel,ce4100-cp", }, | ||
111 | { .compatible = "isa", }, | ||
112 | { .compatible = "pci", }, | ||
113 | {}, | ||
114 | }; | ||
115 | |||
116 | static int __init add_bus_probe(void) | ||
117 | { | ||
118 | if (!initial_boot_params) | ||
119 | return 0; | ||
120 | |||
121 | return of_platform_bus_probe(NULL, ce4100_ids, NULL); | ||
122 | } | ||
123 | module_init(add_bus_probe); | ||
124 | |||
106 | #ifdef CONFIG_PCI | 125 | #ifdef CONFIG_PCI |
107 | static int x86_of_pci_irq_enable(struct pci_dev *dev) | 126 | static int x86_of_pci_irq_enable(struct pci_dev *dev) |
108 | { | 127 | { |