diff options
| author |   Greg Ungerer <gerg@uclinux.org> | 2012-04-17 17:06:34 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-04-17 17:06:34 +1000 |
| commit | 938ed25008d665d1dd937ca251d1aabb363113c6 (patch) | |
| tree | 943f55df77b1b36681acb5a8f4bd39e365a4af99 /arch/m68k/platform/527x/config.c | |
| parent | m68knommu: fix id number for second eth device on 5275 ColdFire (diff) | |
| download | linux-dev-938ed25008d665d1dd937ca251d1aabb363113c6.tar.xz linux-dev-938ed25008d665d1dd937ca251d1aabb363113c6.zip | |
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: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/m68k/platform/527x/config.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c index 7ed848c3b848..f91a53294c35 100644 --- a/arch/m68k/platform/527x/config.c +++ b/arch/m68k/platform/527x/config.c @@ -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); |