Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ca08a82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68k fixes from Greg Ungerer:
 "Nothing big, spelling fixes and fix/cleanup for ColdFire eth device setup"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix fec setup warning for ColdFire 5271 builds
  m68knommu: ColdFire 5271 only has a single FEC controller
  m68k: Fix trivial typos in comments
parents f4d03bd1 6e420613

arch/m68k/coldfire/m527x.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

arch/m68k/include/asm/m527xsim.h

+2 −0
Original line number Diff line number Diff line
@@ -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.

arch/m68k/include/asm/m68360_pram.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */