diff options
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/m528xsim.h | 11 | ||||
-rw-r--r-- | arch/m68k/platform/528x/config.c | 16 |
2 files changed, 17 insertions, 10 deletions
diff --git a/arch/m68k/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h index a5f0c14b47dd..a363c648b97b 100644 --- a/arch/m68k/include/asm/m528xsim.h +++ b/arch/m68k/include/asm/m528xsim.h | |||
@@ -38,12 +38,19 @@ | |||
38 | #define MCFINT_UART1 14 /* Interrupt number for UART1 */ | 38 | #define MCFINT_UART1 14 /* Interrupt number for UART1 */ |
39 | #define MCFINT_UART2 15 /* Interrupt number for UART2 */ | 39 | #define MCFINT_UART2 15 /* Interrupt number for UART2 */ |
40 | #define MCFINT_QSPI 18 /* Interrupt number for QSPI */ | 40 | #define MCFINT_QSPI 18 /* Interrupt number for QSPI */ |
41 | #define MCFINT_FECRX0 23 /* Interrupt number for FEC */ | ||
42 | #define MCFINT_FECTX0 27 /* Interrupt number for FEC */ | ||
43 | #define MCFINT_FECENTC0 29 /* Interrupt number for FEC */ | ||
41 | #define MCFINT_PIT1 55 /* Interrupt number for PIT1 */ | 44 | #define MCFINT_PIT1 55 /* Interrupt number for PIT1 */ |
42 | 45 | ||
43 | #define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) | 46 | #define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) |
44 | #define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) | 47 | #define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) |
45 | #define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) | 48 | #define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) |
46 | 49 | ||
50 | #define MCF_IRQ_FECRX0 (MCFINT_VECBASE + MCFINT_FECRX0) | ||
51 | #define MCF_IRQ_FECTX0 (MCFINT_VECBASE + MCFINT_FECTX0) | ||
52 | #define MCF_IRQ_FECENTC0 (MCFINT_VECBASE + MCFINT_FECENTC0) | ||
53 | |||
47 | /* | 54 | /* |
48 | * SDRAM configuration registers. | 55 | * SDRAM configuration registers. |
49 | */ | 56 | */ |
@@ -71,8 +78,8 @@ | |||
71 | /* | 78 | /* |
72 | * FEC ethernet module. | 79 | * FEC ethernet module. |
73 | */ | 80 | */ |
74 | #define MCFFEC_BASE (MCF_IPSBAR + 0x00001000) | 81 | #define MCFFEC_BASE0 (MCF_IPSBAR + 0x00001000) |
75 | #define MCFFEC_SIZE 0x800 | 82 | #define MCFFEC_SIZE0 0x800 |
76 | 83 | ||
77 | /* | 84 | /* |
78 | * GPIO registers | 85 | * GPIO registers |
diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c index f75ee8bf5e35..39fc3c16388d 100644 --- a/arch/m68k/platform/528x/config.c +++ b/arch/m68k/platform/528x/config.c | |||
@@ -29,23 +29,23 @@ | |||
29 | 29 | ||
30 | static struct resource m528x_fec_resources[] = { | 30 | static struct resource m528x_fec_resources[] = { |
31 | { | 31 | { |
32 | .start = MCFFEC_BASE, | 32 | .start = MCFFEC_BASE0, |
33 | .end = MCFFEC_BASE + MCFFEC_SIZE - 1, | 33 | .end = MCFFEC_BASE0 + MCFFEC_SIZE0 - 1, |
34 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
35 | }, | 35 | }, |
36 | { | 36 | { |
37 | .start = 64 + 23, | 37 | .start = MCF_IRQ_FECRX0, |
38 | .end = 64 + 23, | 38 | .end = MCF_IRQ_FECRX0, |
39 | .flags = IORESOURCE_IRQ, | 39 | .flags = IORESOURCE_IRQ, |
40 | }, | 40 | }, |
41 | { | 41 | { |
42 | .start = 64 + 27, | 42 | .start = MCF_IRQ_FECTX0, |
43 | .end = 64 + 27, | 43 | .end = MCF_IRQ_FECTX0, |
44 | .flags = IORESOURCE_IRQ, | 44 | .flags = IORESOURCE_IRQ, |
45 | }, | 45 | }, |
46 | { | 46 | { |
47 | .start = 64 + 29, | 47 | .start = MCF_IRQ_FECENTC0, |
48 | .end = 64 + 29, | 48 | .end = MCF_IRQ_FECENTC0, |
49 | .flags = IORESOURCE_IRQ, | 49 | .flags = IORESOURCE_IRQ, |
50 | }, | 50 | }, |
51 | }; | 51 | }; |