aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/m520xsim.h11
-rw-r--r--arch/m68k/platform/520x/config.c16
2 files changed, 17 insertions, 10 deletions
diff --git a/arch/m68k/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h
index 41ed4dc8d736..b83cee2dfdac 100644
--- a/arch/m68k/include/asm/m520xsim.h
+++ b/arch/m68k/include/asm/m520xsim.h
@@ -48,12 +48,19 @@
48#define MCFINT_UART1 27 /* Interrupt number for UART1 */ 48#define MCFINT_UART1 27 /* Interrupt number for UART1 */
49#define MCFINT_UART2 28 /* Interrupt number for UART2 */ 49#define MCFINT_UART2 28 /* Interrupt number for UART2 */
50#define MCFINT_QSPI 31 /* Interrupt number for QSPI */ 50#define MCFINT_QSPI 31 /* Interrupt number for QSPI */
51#define MCFINT_FECRX0 36 /* Interrupt number for FEC RX */
52#define MCFINT_FECTX0 40 /* Interrupt number for FEC RX */
53#define MCFINT_FECENTC0 42 /* Interrupt number for FEC RX */
51#define MCFINT_PIT1 4 /* Interrupt number for PIT1 (PIT0 in processor) */ 54#define MCFINT_PIT1 4 /* Interrupt number for PIT1 (PIT0 in processor) */
52 55
53#define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) 56#define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0)
54#define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) 57#define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1)
55#define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) 58#define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2)
56 59
60#define MCF_IRQ_FECRX0 (MCFINT_VECBASE + MCFINT_FECRX0)
61#define MCF_IRQ_FECTX0 (MCFINT_VECBASE + MCFINT_FECTX0)
62#define MCF_IRQ_FECENTC0 (MCFINT_VECBASE + MCFINT_FECENTC0)
63
57/* 64/*
58 * SDRAM configuration registers. 65 * SDRAM configuration registers.
59 */ 66 */
@@ -155,8 +162,8 @@
155/* 162/*
156 * FEC module. 163 * FEC module.
157 */ 164 */
158#define MCFFEC_BASE 0xFC030000 /* Base of FEC ethernet */ 165#define MCFFEC_BASE0 0xFC030000 /* Base of FEC ethernet */
159#define MCFFEC_SIZE 0x800 /* Register set size */ 166#define MCFFEC_SIZE0 0x800 /* Register set size */
160 167
161/* 168/*
162 * Reset Control Unit. 169 * Reset Control Unit.
diff --git a/arch/m68k/platform/520x/config.c b/arch/m68k/platform/520x/config.c
index 3af397262115..5111902cb274 100644
--- a/arch/m68k/platform/520x/config.c
+++ b/arch/m68k/platform/520x/config.c
@@ -27,23 +27,23 @@
27 27
28static struct resource m520x_fec_resources[] = { 28static struct resource m520x_fec_resources[] = {
29 { 29 {
30 .start = MCFFEC_BASE, 30 .start = MCFFEC_BASE0,
31 .end = MCFFEC_BASE + MCFFEC_SIZE - 1, 31 .end = MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,
32 .flags = IORESOURCE_MEM, 32 .flags = IORESOURCE_MEM,
33 }, 33 },
34 { 34 {
35 .start = 64 + 36, 35 .start = MCF_IRQ_FEXRX0,
36 .end = 64 + 36, 36 .end = MCF_IRQ_FECRX0,
37 .flags = IORESOURCE_IRQ, 37 .flags = IORESOURCE_IRQ,
38 }, 38 },
39 { 39 {
40 .start = 64 + 40, 40 .start = MCF_IRQ_FECTX0,
41 .end = 64 + 40, 41 .end = MCF_IRQ_FECTX0,
42 .flags = IORESOURCE_IRQ, 42 .flags = IORESOURCE_IRQ,
43 }, 43 },
44 { 44 {
45 .start = 64 + 42, 45 .start = MCF_IRQ_FECENTC0,
46 .end = 64 + 42, 46 .end = MCF_IRQ_FECENTC0,
47 .flags = IORESOURCE_IRQ, 47 .flags = IORESOURCE_IRQ,
48 }, 48 },
49}; 49};