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

Commit 938ed250 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: make sure 2nd FEC eth interface pins are enabled on 5275 ColdFire 



The CONFIG_FEC2 define was removed from the kernel many versions ago.
But it is still being used to set the multi-function pins when compiling
for a ColdFire 527[45] SoC that has 2 ethernet interfaces. Remove the
last remaining uses of this define, and so fix the setting of the pins
for the 2nd ethernet interface.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent bfdd769a

arch/m68k/configs/m5275evb_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_FEC=y

CONFIG_FEC2=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_PPP=y

arch/m68k/platform/527x/config.c

+0 −2
Original line number Diff line number Diff line
@@ -74,9 +74,7 @@ static void __init m527x_fec_init(void) 
	writew(par | 0xf00, MCF_IPSBAR + 0x100082);

	v = readb(MCF_IPSBAR + 0x100078);

	writeb(v | 0xc0, MCF_IPSBAR + 0x100078);

#endif



#ifdef CONFIG_FEC2

	/* Set multi-function pins to ethernet mode for fec1 */

	par = readw(MCF_IPSBAR + 0x100082);

	writew(par | 0xa0, MCF_IPSBAR + 0x100082);