diff options
-rw-r--r-- | arch/m68k/include/asm/m532xsim.h | 13 | ||||
-rw-r--r-- | arch/m68k/platform/532x/config.c | 16 |
2 files changed, 21 insertions, 8 deletions
diff --git a/arch/m68k/include/asm/m532xsim.h b/arch/m68k/include/asm/m532xsim.h index f963d64c94e3..f1c4fa80657d 100644 --- a/arch/m68k/include/asm/m532xsim.h +++ b/arch/m68k/include/asm/m532xsim.h | |||
@@ -24,11 +24,18 @@ | |||
24 | #define MCFINT_UART1 27 /* Interrupt number for UART1 */ | 24 | #define MCFINT_UART1 27 /* Interrupt number for UART1 */ |
25 | #define MCFINT_UART2 28 /* Interrupt number for UART2 */ | 25 | #define MCFINT_UART2 28 /* Interrupt number for UART2 */ |
26 | #define MCFINT_QSPI 31 /* Interrupt number for QSPI */ | 26 | #define MCFINT_QSPI 31 /* Interrupt number for QSPI */ |
27 | #define MCFINT_FECRX0 36 /* Interrupt number for FEC */ | ||
28 | #define MCFINT_FECTX0 40 /* Interrupt number for FEC */ | ||
29 | #define MCFINT_FECENTC0 42 /* Interrupt number for FEC */ | ||
27 | 30 | ||
28 | #define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) | 31 | #define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) |
29 | #define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) | 32 | #define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) |
30 | #define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) | 33 | #define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) |
31 | 34 | ||
35 | #define MCF_IRQ_FECRX0 (MCFINT_VECBASE + MCFINT_FECRX0) | ||
36 | #define MCF_IRQ_FECTX0 (MCFINT_VECBASE + MCFINT_FECTX0) | ||
37 | #define MCF_IRQ_FECENTC0 (MCFINT_VECBASE + MCFINT_FECENTC0) | ||
38 | |||
32 | #define MCF_WTM_WCR MCF_REG16(0xFC098000) | 39 | #define MCF_WTM_WCR MCF_REG16(0xFC098000) |
33 | 40 | ||
34 | /* | 41 | /* |
@@ -91,6 +98,12 @@ | |||
91 | #define MCFUART_BASE2 0xFC068000 /* Base address of UART3 */ | 98 | #define MCFUART_BASE2 0xFC068000 /* Base address of UART3 */ |
92 | 99 | ||
93 | /* | 100 | /* |
101 | * FEC module. | ||
102 | */ | ||
103 | #define MCFFEC_BASE0 0xFC030000 /* Base address of FEC0 */ | ||
104 | #define MCFFEC_SIZE0 0x800 /* Size of FEC0 region */ | ||
105 | |||
106 | /* | ||
94 | * Timer module. | 107 | * Timer module. |
95 | */ | 108 | */ |
96 | #define MCFTIMER_BASE1 0xFC070000 /* Base address of TIMER1 */ | 109 | #define MCFTIMER_BASE1 0xFC070000 /* Base address of TIMER1 */ |
diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c index 24b4c0de628b..4831f7a6b8dc 100644 --- a/arch/m68k/platform/532x/config.c +++ b/arch/m68k/platform/532x/config.c | |||
@@ -35,23 +35,23 @@ | |||
35 | 35 | ||
36 | static struct resource m532x_fec_resources[] = { | 36 | static struct resource m532x_fec_resources[] = { |
37 | { | 37 | { |
38 | .start = 0xfc030000, | 38 | .start = MCFFEC_BASE0, |
39 | .end = 0xfc0307ff, | 39 | .end = MCFFEC_BASE0 + MCFFEC_SIZE0 - 1, |
40 | .flags = IORESOURCE_MEM, | 40 | .flags = IORESOURCE_MEM, |
41 | }, | 41 | }, |
42 | { | 42 | { |
43 | .start = 64 + 36, | 43 | .start = MCF_IRQ_FECRX0, |
44 | .end = 64 + 36, | 44 | .end = MCF_IRQ_FECRX0, |
45 | .flags = IORESOURCE_IRQ, | 45 | .flags = IORESOURCE_IRQ, |
46 | }, | 46 | }, |
47 | { | 47 | { |
48 | .start = 64 + 40, | 48 | .start = MCF_IRQ_FECTX0, |
49 | .end = 64 + 40, | 49 | .end = MCF_IRQ_FECTX0, |
50 | .flags = IORESOURCE_IRQ, | 50 | .flags = IORESOURCE_IRQ, |
51 | }, | 51 | }, |
52 | { | 52 | { |
53 | .start = 64 + 42, | 53 | .start = MCF_IRQ_FECENTC0, |
54 | .end = 64 + 42, | 54 | .end = MCF_IRQ_FECENTC0, |
55 | .flags = IORESOURCE_IRQ, | 55 | .flags = IORESOURCE_IRQ, |
56 | }, | 56 | }, |
57 | }; | 57 | }; |