diff options
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/m523xsim.h | 13 | ||||
-rw-r--r-- | arch/m68k/platform/523x/config.c | 16 |
2 files changed, 18 insertions, 11 deletions
diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h index 919d115bd167..e1988dd372fe 100644 --- a/arch/m68k/include/asm/m523xsim.h +++ b/arch/m68k/include/asm/m523xsim.h | |||
@@ -37,13 +37,20 @@ | |||
37 | #define MCFINT_UART0 13 /* Interrupt number for UART0 */ | 37 | #define MCFINT_UART0 13 /* Interrupt number for UART0 */ |
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_PIT1 36 /* Interrupt number for PIT1 */ | ||
41 | #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 */ | ||
44 | #define MCFINT_PIT1 36 /* 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 | */ |
@@ -72,8 +79,8 @@ | |||
72 | /* | 79 | /* |
73 | * FEC ethernet module. | 80 | * FEC ethernet module. |
74 | */ | 81 | */ |
75 | #define MCFFEC_BASE (MCF_IPSBAR + 0x1000) | 82 | #define MCFFEC_BASE0 (MCF_IPSBAR + 0x1000) |
76 | #define MCFFEC_SIZE 0x800 | 83 | #define MCFFEC_SIZE0 0x800 |
77 | 84 | ||
78 | /* | 85 | /* |
79 | * GPIO module. | 86 | * GPIO module. |
diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c index ef46009540e5..2a1dcade0c02 100644 --- a/arch/m68k/platform/523x/config.c +++ b/arch/m68k/platform/523x/config.c | |||
@@ -28,23 +28,23 @@ | |||
28 | 28 | ||
29 | static struct resource m523x_fec_resources[] = { | 29 | static struct resource m523x_fec_resources[] = { |
30 | { | 30 | { |
31 | .start = MCFFEC_BASE, | 31 | .start = MCFFEC_BASE0, |
32 | .end = MCFFEC_BASE + MCFFEC_SIZE - 1, | 32 | .end = MCFFEC_BASE0 + MCFFEC_SIZE0 - 1, |
33 | .flags = IORESOURCE_MEM, | 33 | .flags = IORESOURCE_MEM, |
34 | }, | 34 | }, |
35 | { | 35 | { |
36 | .start = 64 + 23, | 36 | .start = MCF_IRQ_FECRX0, |
37 | .end = 64 + 23, | 37 | .end = MCF_IRQ_FECRX0, |
38 | .flags = IORESOURCE_IRQ, | 38 | .flags = IORESOURCE_IRQ, |
39 | }, | 39 | }, |
40 | { | 40 | { |
41 | .start = 64 + 27, | 41 | .start = MCF_IRQ_FECTX0, |
42 | .end = 64 + 27, | 42 | .end = MCF_IRQ_FECTX0, |
43 | .flags = IORESOURCE_IRQ, | 43 | .flags = IORESOURCE_IRQ, |
44 | }, | 44 | }, |
45 | { | 45 | { |
46 | .start = 64 + 29, | 46 | .start = MCF_IRQ_FECENTC0, |
47 | .end = 64 + 29, | 47 | .end = MCF_IRQ_FECENTC0, |
48 | .flags = IORESOURCE_IRQ, | 48 | .flags = IORESOURCE_IRQ, |
49 | }, | 49 | }, |
50 | }; | 50 | }; |