diff options
-rw-r--r-- | arch/m68k/include/asm/m523xsim.h | 8 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/m523x.c | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h index 91d3abc3f2a5..d1d4ec74d286 100644 --- a/arch/m68k/include/asm/m523xsim.h +++ b/arch/m68k/include/asm/m523xsim.h | |||
@@ -189,8 +189,16 @@ | |||
189 | /* | 189 | /* |
190 | * Pin Assignment | 190 | * Pin Assignment |
191 | */ | 191 | */ |
192 | #define MCFGPIO_PAR_AD (MCF_IPSBAR + 0x100040) | ||
193 | #define MCFGPIO_PAR_BUSCTL (MCF_IPSBAR + 0x100042) | ||
194 | #define MCFGPIO_PAR_BS (MCF_IPSBAR + 0x100044) | ||
195 | #define MCFGPIO_PAR_CS (MCF_IPSBAR + 0x100045) | ||
196 | #define MCFGPIO_PAR_SDRAM (MCF_IPSBAR + 0x100046) | ||
197 | #define MCFGPIO_PAR_FECI2C (MCF_IPSBAR + 0x100047) | ||
198 | #define MCFGPIO_PAR_UART (MCF_IPSBAR + 0x100048) | ||
192 | #define MCFGPIO_PAR_QSPI (MCF_IPSBAR + 0x10004A) | 199 | #define MCFGPIO_PAR_QSPI (MCF_IPSBAR + 0x10004A) |
193 | #define MCFGPIO_PAR_TIMER (MCF_IPSBAR + 0x10004C) | 200 | #define MCFGPIO_PAR_TIMER (MCF_IPSBAR + 0x10004C) |
201 | #define MCFGPIO_PAR_ETPU (MCF_IPSBAR + 0x10004E) | ||
194 | 202 | ||
195 | /* | 203 | /* |
196 | * DMA unit base addresses. | 204 | * DMA unit base addresses. |
diff --git a/arch/m68k/platform/coldfire/m523x.c b/arch/m68k/platform/coldfire/m523x.c index d47dfd8f50a2..ff37fe9553ea 100644 --- a/arch/m68k/platform/coldfire/m523x.c +++ b/arch/m68k/platform/coldfire/m523x.c | |||
@@ -42,14 +42,8 @@ static void __init m523x_qspi_init(void) | |||
42 | 42 | ||
43 | static void __init m523x_fec_init(void) | 43 | static void __init m523x_fec_init(void) |
44 | { | 44 | { |
45 | u16 par; | ||
46 | u8 v; | ||
47 | |||
48 | /* Set multi-function pins to ethernet use */ | 45 | /* Set multi-function pins to ethernet use */ |
49 | par = readw(MCF_IPSBAR + 0x100082); | 46 | writeb(readb(MCFGPIO_PAR_FECI2C) | 0xf0, MCFGPIO_PAR_FECI2C); |
50 | writew(par | 0xf00, MCF_IPSBAR + 0x100082); | ||
51 | v = readb(MCF_IPSBAR + 0x100078); | ||
52 | writeb(v | 0xc0, MCF_IPSBAR + 0x100078); | ||
53 | } | 47 | } |
54 | 48 | ||
55 | /***************************************************************************/ | 49 | /***************************************************************************/ |