Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / arch / powerpc / platforms / cell / setup.c

diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 4f6347c9fe68266d4d88638fa33b18d61f6fb7d1..dda34650cb07d32afff1c86dadd856e0eb48c394 100644 (file)
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -85,9 +85,6 @@ static int __init cell_publish_devices(void)
 {
        int node;
 
-       if (!machine_is(cell))
-               return 0;
-
        /* Publish OF platform devices for southbridge IOs */
        of_platform_bus_probe(NULL, NULL, NULL);
 
@@ -101,7 +98,7 @@ static int __init cell_publish_devices(void)
        }
        return 0;
 }
-device_initcall(cell_publish_devices);
+machine_subsys_initcall(cell, cell_publish_devices);
 
 static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
 {
@@ -152,6 +149,11 @@ static void __init cell_init_irq(void)
        mpic_init_IRQ();
 }
 
+static void __init cell_set_dabrx(void)
+{
+       mtspr(SPRN_DABRX, DABRX_KERNEL | DABRX_USER);
+}
+
 static void __init cell_setup_arch(void)
 {
 #ifdef CONFIG_SPU_BASE
@@ -161,6 +163,8 @@ static void __init cell_setup_arch(void)
 
        cbe_regs_init();
 
+       cell_set_dabrx();
+
 #ifdef CONFIG_CBE_RAS
        cbe_ras_init();
 #endif