From faa7cc2862c861d241cdb052e495e296bece1ccb Mon Sep 17 00:00:00 2001 From: Yannick Guerrini Date: Mon, 9 Mar 2015 22:29:24 +0100 Subject: m68k: Fix trivial typos in comments Change 'Reaceive' to 'Receive' Change 'alighnment' to 'alignment' Signed-off-by: Yannick Guerrini Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/m68360_pram.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/m68k/include/asm/m68360_pram.h b/arch/m68k/include/asm/m68360_pram.h index e6088bbce93d..c0cbd96f09bc 100644 --- a/arch/m68k/include/asm/m68360_pram.h +++ b/arch/m68k/include/asm/m68360_pram.h @@ -170,7 +170,7 @@ struct uart_pram { unsigned short frmer; /* Rx framing error counter */ unsigned short nosec; /* Rx noise counter */ unsigned short brkec; /* Rx break character counter */ - unsigned short brkln; /* Reaceive break length */ + unsigned short brkln; /* Receive break length */ unsigned short uaddr1; /* address character 1 */ unsigned short uaddr2; /* address character 2 */ @@ -338,7 +338,7 @@ struct ethernet_pram { unsigned long c_pres; /* preset CRC */ unsigned long c_mask; /* constant mask for CRC */ unsigned long crcec; /* CRC error counter */ - unsigned long alec; /* alighnment error counter */ + unsigned long alec; /* alignment error counter */ unsigned long disfc; /* discard frame counter */ unsigned short pads; /* short frame PAD characters */ unsigned short ret_lim; /* retry limit threshold */ -- cgit v1.2.3 From a630ec1b64c57f681877cc19c8e7ea5640cf7fcb Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Wed, 18 Mar 2015 10:14:45 +1000 Subject: 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 --- arch/m68k/include/asm/m527xsim.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') 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. -- cgit v1.2.3 From 6e4206136faa9a4d588946dfa604e1d989a9b3b6 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 24 Mar 2015 11:08:22 +1000 Subject: m68knommu: fix fec setup warning for ColdFire 5271 builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building for the ColdFire 5271 produces the following warning: arch/m68k/coldfire/m527x.c: In function ‘m527x_fec_init’: arch/m68k/coldfire/m527x.c:95:6: warning: unused variable ‘par’ Fix it by moving the definition of par inside the 5271 conditional code. Reported-by: ertheb <3rth3bnospam@ethe.fr> Signed-off-by: Greg Ungerer --- arch/m68k/coldfire/m527x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/m68k/coldfire/m527x.c b/arch/m68k/coldfire/m527x.c index 2ba470735bed..c0b3e28f91df 100644 --- a/arch/m68k/coldfire/m527x.c +++ b/arch/m68k/coldfire/m527x.c @@ -92,7 +92,6 @@ static void __init m527x_uarts_init(void) static void __init m527x_fec_init(void) { - u16 par; u8 v; /* Set multi-function pins to ethernet mode for fec0 */ @@ -100,6 +99,8 @@ static void __init m527x_fec_init(void) v = readb(MCFGPIO_PAR_FECI2C); writeb(v | 0xf0, MCFGPIO_PAR_FECI2C); #else + u16 par; + par = readw(MCFGPIO_PAR_FECI2C); writew(par | 0xf00, MCFGPIO_PAR_FECI2C); v = readb(MCFGPIO_PAR_FEC0HL); -- cgit v1.2.3