diff options
| author |   Wolfram Sang <w.sang@pengutronix.de> | 2008-10-15 11:09:59 -0600 |
|---|---|---|
| committer |   Grant Likely <grant.likely@secretlab.ca> | 2008-10-15 11:09:59 -0600 |
| commit | 9629095761b64636356c132f0228ed780ebb97e8 (patch) | |
| tree | de195145a4682330982de3d048abedaee66de178 /arch/powerpc/platforms/52xx/mpc52xx_common.c | |
| parent | powerpc/52xx: Make cuImage more robust in locating immr node. (diff) | |
| download | linux-dev-9629095761b64636356c132f0228ed780ebb97e8.tar.xz linux-dev-9629095761b64636356c132f0228ed780ebb97e8.zip | |
powerpc/mpc5200: Don't touch pipelining for MPC5200B
MPC5200 needs to have pipelining disabled for ATA to work. MPC5200B does not.
So, for the latter, don't touch the original setting from the bootloader.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_common.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); } |