summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2015-03-18 01:14:45 +0100
committerGreg Ungerer <gerg@uclinux.org>2015-03-30 01:52:24 +0200
commita630ec1b64c57f681877cc19c8e7ea5640cf7fcb (patch)
tree103bf58b14e8f38a4f0eb1e93ec2c87a6d4d4eb4
parentm68k: Fix trivial typos in comments (diff)
downloadlinux-a630ec1b64c57f681877cc19c8e7ea5640cf7fcb.tar.xz
linux-a630ec1b64c57f681877cc19c8e7ea5640cf7fcb.zip
m68knommu: ColdFire 5271 only has a single FEC controller
The inclusion of multiple FEC ethernet platform devices is based around the FEC address definitions in the platform headers. The ColdFire m527x platform is defining 2 FEC modules, but the 5271 SoC only has a single FEC hardware module. The attempt to probe and init a second FEC module causes a trap and dump on boot on this platform. Fix the definitions so that only the 5275 SoC platform (which has 2 FEC hardware modules) defines the second base address. Reported-by: ertheb <3rth3bnospam@ethe.fr> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r--arch/m68k/include/asm/m527xsim.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h
index 1bebbe78055a..2c648a043f24 100644
--- a/arch/m68k/include/asm/m527xsim.h
+++ b/arch/m68k/include/asm/m527xsim.h
@@ -103,8 +103,10 @@
*/
#define MCFFEC_BASE0 (MCF_IPSBAR + 0x1000)
#define MCFFEC_SIZE0 0x800
+#ifdef CONFIG_M5275
#define MCFFEC_BASE1 (MCF_IPSBAR + 0x1800)
#define MCFFEC_SIZE1 0x800
+#endif
/*
* QSPI module.