From f6f8ecd7e1ade9a93ae3e0bb056e620b66a1f849 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Wed, 15 Oct 2008 11:09:59 -0600 Subject: [PATCH] --- yaml --- r: 116930 b: refs/heads/master c: 9629095761b64636356c132f0228ed780ebb97e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/52xx/mpc52xx_common.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4361c796c01c..c2ab80ad537a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40847993d881050cbfa7184db33603165ba84fa1 +refs/heads/master: 9629095761b64636356c132f0228ed780ebb97e8 diff --git a/trunk/arch/powerpc/platforms/52xx/mpc52xx_common.c b/trunk/arch/powerpc/platforms/52xx/mpc52xx_common.c index 044b4e6e8743..ae7c34f37e1c 100644 --- a/trunk/arch/powerpc/platforms/52xx/mpc52xx_common.c +++ b/trunk/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); }