Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 85xx / tqm85xx.c

diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index a682cbcdfb9ec579e36dd62f0a6ffc015e74b9da..2933a8e827d9a5c8bbd259e41864fa158fa43cd7 100644 (file)
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -120,15 +120,24 @@ static void __init tqm85xx_setup_arch(void)
 #endif
 
 #ifdef CONFIG_PCI
-       for_each_compatible_node(np, "pci", "fsl,mpc8540-pci")
-               fsl_add_bridge(np, 1);
+       for_each_node_by_type(np, "pci") {
+               if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
+                   of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                       struct resource rsrc;
+                       if (!of_address_to_resource(np, 0, &rsrc)) {
+                               if ((rsrc.start & 0xfffff) == 0x8000)
+                                       fsl_add_bridge(np, 1);
+                               else
+                                       fsl_add_bridge(np, 0);
+                       }
+               }
+       }
 #endif
 }
 
 static void tqm85xx_show_cpuinfo(struct seq_file *m)
 {
        uint pvid, svid, phid1;
-       uint memsize = total_memory;
 
        pvid = mfspr(SPRN_PVR);
        svid = mfspr(SPRN_SVR);
@@ -140,9 +149,6 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m)
        /* Display cpu Pll setting */
        phid1 = mfspr(SPRN_HID1);
        seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-
-       /* Display the amount of memory */
-       seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
 static struct of_device_id __initdata of_bus_ids[] = {
@@ -167,6 +173,7 @@ static int __init tqm85xx_probe(void)
 
        if ((of_flat_dt_is_compatible(root, "tqc,tqm8540")) ||
            (of_flat_dt_is_compatible(root, "tqc,tqm8541")) ||
+           (of_flat_dt_is_compatible(root, "tqc,tqm8548")) ||
            (of_flat_dt_is_compatible(root, "tqc,tqm8555")) ||
            (of_flat_dt_is_compatible(root, "tqc,tqm8560")))
                return 1;