diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 10:05:14 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 10:05:14 +0100 |
| commit | a1b5344620a3e6291afaf7542714ba9c391ef1c7 (patch) | |
| tree | b79b51bc4019ea50efbbac4a7f7717b6e6d749c0 /arch/powerpc/sysdev/cpm1.c | |
| parent | Merge branch 'topic/mprofile-kernel' into next (diff) | |
| parent | powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible (diff) | |
| download | linux-a1b5344620a3e6291afaf7542714ba9c391ef1c7.tar.xz linux-a1b5344620a3e6291afaf7542714ba9c391ef1c7.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx optimizations, 32-bit checksum optimizations,
86xx consolidation, e5500/e6500 cpu hotplug, more fman and other dt
bits, and minor fixes/cleanup."
Diffstat (limited to 'arch/powerpc/sysdev/cpm1.c')
| -rw-r--r-- | arch/powerpc/sysdev/cpm1.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c index 5e6ff38ea69f..8ed65365be50 100644 --- a/arch/powerpc/sysdev/cpm1.c +++ b/arch/powerpc/sysdev/cpm1.c @@ -228,7 +228,10 @@ void __init cpm_reset(void) * Bit 25, FAM can also be set to use FEC aggressive mode (860T). */ siu_conf = immr_map(im_siu_conf); - out_be32(&siu_conf->sc_sdcr, 1); + if ((mfspr(SPRN_IMMR) & 0xffff) == 0x0900) /* MPC885 */ + out_be32(&siu_conf->sc_sdcr, 0x40); + else + out_be32(&siu_conf->sc_sdcr, 1); immr_unmap(siu_conf); cpm_muram_init(); |