aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/cell/setup.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-07-03 05:32:51 -0400
committerPaul Mackerras <paulus@samba.org>2006-07-03 05:55:12 -0400
commitb9e5b4e6a991a5a6d521f2e20a65835404b4169f (patch)
treea0ac972faae4bf9133f576d842667bb134190341 /arch/powerpc/platforms/cell/setup.c
parent5a43a066b11ac2fe84cf67307f20b83bea390f83 (diff)
[POWERPC] Use the genirq framework
This adapts the generic powerpc interrupt handling code, and all of the platforms except for the embedded 6xx machines, to use the new genirq framework. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/cell/setup.c')
-rw-r--r--arch/powerpc/platforms/cell/setup.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 01ec39431fb0..70a4e903f7e2 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -80,10 +80,14 @@ static void cell_progress(char *s, unsigned short hex)
80 printk("*** %04x : %s\n", hex, s ? s : ""); 80 printk("*** %04x : %s\n", hex, s ? s : "");
81} 81}
82 82
83static void __init cell_init_irq(void)
84{
85 iic_init_IRQ();
86 spider_init_IRQ();
87}
88
83static void __init cell_setup_arch(void) 89static void __init cell_setup_arch(void)
84{ 90{
85 ppc_md.init_IRQ = iic_init_IRQ;
86 ppc_md.get_irq = iic_get_irq;
87#ifdef CONFIG_SPU_BASE 91#ifdef CONFIG_SPU_BASE
88 spu_priv1_ops = &spu_priv1_mmio_ops; 92 spu_priv1_ops = &spu_priv1_mmio_ops;
89#endif 93#endif
@@ -109,7 +113,6 @@ static void __init cell_setup_arch(void)
109 /* Find and initialize PCI host bridges */ 113 /* Find and initialize PCI host bridges */
110 init_pci_config_tokens(); 114 init_pci_config_tokens();
111 find_and_init_phbs(); 115 find_and_init_phbs();
112 spider_init_IRQ();
113 cbe_pervasive_init(); 116 cbe_pervasive_init();
114#ifdef CONFIG_DUMMY_CONSOLE 117#ifdef CONFIG_DUMMY_CONSOLE
115 conswitchp = &dummy_con; 118 conswitchp = &dummy_con;
@@ -174,6 +177,9 @@ define_machine(cell) {
174 .calibrate_decr = generic_calibrate_decr, 177 .calibrate_decr = generic_calibrate_decr,
175 .check_legacy_ioport = cell_check_legacy_ioport, 178 .check_legacy_ioport = cell_check_legacy_ioport,
176 .progress = cell_progress, 179 .progress = cell_progress,
180 .init_IRQ = cell_init_irq,
181 .get_irq = iic_get_irq,
182
177#ifdef CONFIG_KEXEC 183#ifdef CONFIG_KEXEC
178 .machine_kexec = default_machine_kexec, 184 .machine_kexec = default_machine_kexec,
179 .machine_kexec_prepare = default_machine_kexec_prepare, 185 .machine_kexec_prepare = default_machine_kexec_prepare,