Merge commit 'gcl/gcl-next'

2 files changed, 9 insertions, 2 deletions

diff --git a/arch/powerpc/boot/cuboot-52xx.c b/arch/powerpc/boot/cuboot-52xx.c
index a8611546a656..4c42ec8687be 100644
--- a/arch/powerpc/boot/cuboot-52xx.c
+++ b/arch/powerpc/boot/cuboot-52xx.c
@@ -37,6 +37,10 @@ static void platform_fixups(void)
          * this can do a simple path lookup.
          */
         soc = find_node_by_devtype(NULL, "soc");
+        if (!soc)
+                soc = find_node_by_compatible(NULL, "fsl,mpc5200-immr");
+        if (!soc)
+                soc = find_node_by_compatible(NULL, "fsl,mpc5200b-immr");
         if (soc) {
                 setprop(soc, "bus-frequency", &bd.bi_ipbfreq,
                         sizeof(bd.bi_ipbfreq));
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index 044b4e6e8743..ae7c34f37e1c 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -99,11 +99,14 @@ mpc5200_setup_xlb_arbiter(void)
         out_be32(&xlb->master_pri_enable, 0xff);
         out_be32(&xlb->master_priority, 0x11111111);
 
-        /* Disable XLB pipelining
+        /*
+         * Disable XLB pipelining
          * (cfr errate 292. We could do this only just before ATA PIO
          *  transaction and re-enable it afterwards ...)
+         * Not needed on MPC5200B.
          */
-        out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
+        if ((mfspr(SPRN_SVR) & MPC5200_SVR_MASK) == MPC5200_SVR)
+                out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
 
         iounmap(xlb);
 }