[PATCH] powerpc: Experimental support for new G5 Macs (#2)

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

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index c0638e47c298e3a9db05371346a77cc494a6740c..1daa5a06e9ea479161219962d494b21f9e7ed86a 100644 (file)
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -75,7 +75,6 @@
 #include <asm/iommu.h>
 #include <asm/smu.h>
 #include <asm/pmc.h>
-#include <asm/mpic.h>
 #include <asm/lmb.h>
 #include <asm/udbg.h>
 
@@ -346,7 +345,7 @@ void __init pmac_setup_arch(void)
 
 #ifdef CONFIG_SMP
        /* Check for Core99 */
-       if (find_devices("uni-n") || find_devices("u3"))
+       if (find_devices("uni-n") || find_devices("u3") || find_devices("u4"))
                smp_ops = &core99_smp_ops;
 #ifdef CONFIG_PPC32
        else
@@ -636,7 +635,7 @@ static void __init pmac_init_early(void)
        /* Setup interrupt mapping options */
        ppc64_interrupt_controller = IC_OPEN_PIC;
 
-       iommu_init_early_u3();
+       iommu_init_early_dart();
 #endif
 }
 
@@ -712,7 +711,7 @@ static int __init pmac_probe(int platform)
         * occupies having to be broken up so the DART itself is not
         * part of the cacheable linar mapping
         */
-       alloc_u3_dart_table();
+       alloc_dart_table();
 #endif
 
 #ifdef CONFIG_PMAC_SMU
@@ -734,10 +733,11 @@ static int pmac_pci_probe_mode(struct pci_bus *bus)
        struct device_node *node = bus->sysdata;
 
        /* We need to use normal PCI probing for the AGP bus,
-          since the device for the AGP bridge isn't in the tree. */
-       if (bus->self == NULL && device_is_compatible(node, "u3-agp"))
+        * since the device for the AGP bridge isn't in the tree.
+        */
+       if (bus->self == NULL && (device_is_compatible(node, "u3-agp") ||
+                                 device_is_compatible(node, "u4-pcie")))
                return PCI_PROBE_NORMAL;
-
        return PCI_PROBE_DEVTREE;
 }
 #endif
@@ -751,7 +751,7 @@ struct machdep_calls __initdata pmac_md = {
        .init_early             = pmac_init_early,
        .show_cpuinfo           = pmac_show_cpuinfo,
        .init_IRQ               = pmac_pic_init,
-       .get_irq                = mpic_get_irq, /* changed later */
+       .get_irq                = NULL, /* changed later */
        .pcibios_fixup          = pmac_pcibios_fixup,
        .restart                = pmac_restart,
        .power_off              = pmac_power_off,