diff options
-rw-r--r-- | arch/m68k/include/asm/m527xsim.h | 15 | ||||
-rw-r--r-- | arch/m68k/platform/527x/config.c | 24 |
2 files changed, 27 insertions, 12 deletions
diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h index 7399968b2efe..59bb776a5e3c 100644 --- a/arch/m68k/include/asm/m527xsim.h +++ b/arch/m68k/include/asm/m527xsim.h | |||
@@ -38,12 +38,27 @@ | |||
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 FEC0 */ | ||
42 | #define MCFINT_FECTX0 27 /* Interrupt number for FEC0 */ | ||
43 | #define MCFINT_FECENTC0 29 /* Interrupt number for FEC0 */ | ||
41 | #define MCFINT_PIT1 36 /* Interrupt number for PIT1 */ | 44 | #define MCFINT_PIT1 36 /* Interrupt number for PIT1 */ |
42 | 45 | ||
46 | #define MCFINT2_VECBASE 128 /* Vector base number 2 */ | ||
47 | #define MCFINT2_FECRX1 23 /* Interrupt number for FEC1 */ | ||
48 | #define MCFINT2_FECTX1 27 /* Interrupt number for FEC1 */ | ||
49 | #define MCFINT2_FECENTC1 29 /* Interrupt number for FEC1 */ | ||
50 | |||
43 | #define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) | 51 | #define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) |
44 | #define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) | 52 | #define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) |
45 | #define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) | 53 | #define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) |
46 | 54 | ||
55 | #define MCF_IRQ_FECRX0 (MCFINT_VECBASE + MCFINT_FECRX0) | ||
56 | #define MCF_IRQ_FECTX0 (MCFINT_VECBASE + MCFINT_FECTX0) | ||
57 | #define MCF_IRQ_FECENTC0 (MCFINT_VECBASE + MCFINT_FECENTC0) | ||
58 | #define MCF_IRQ_FECRX1 (MCFINT2_VECBASE + MCFINT2_FECRX1) | ||
59 | #define MCF_IRQ_FECTX1 (MCFINT2_VECBASE + MCFINT2_FECTX1) | ||
60 | #define MCF_IRQ_FECENTC1 (MCFINT2_VECBASE + MCFINT2_FECENTC1) | ||
61 | |||
47 | /* | 62 | /* |
48 | * SDRAM configuration registers. | 63 | * SDRAM configuration registers. |
49 | */ | 64 | */ |
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c index f05fbe01e740..461325a3af94 100644 --- a/arch/m68k/platform/527x/config.c +++ b/arch/m68k/platform/527x/config.c | |||
@@ -33,18 +33,18 @@ static struct resource m527x_fec0_resources[] = { | |||
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 | }; |
@@ -56,18 +56,18 @@ static struct resource m527x_fec1_resources[] = { | |||
56 | .flags = IORESOURCE_MEM, | 56 | .flags = IORESOURCE_MEM, |
57 | }, | 57 | }, |
58 | { | 58 | { |
59 | .start = 128 + 23, | 59 | .start = MCF_IRQ_FECRX1, |
60 | .end = 128 + 23, | 60 | .end = MCF_IRQ_FECRX1, |
61 | .flags = IORESOURCE_IRQ, | 61 | .flags = IORESOURCE_IRQ, |
62 | }, | 62 | }, |
63 | { | 63 | { |
64 | .start = 128 + 27, | 64 | .start = MCF_IRQ_FECTX1, |
65 | .end = 128 + 27, | 65 | .end = MCF_IRQ_FECTX1, |
66 | .flags = IORESOURCE_IRQ, | 66 | .flags = IORESOURCE_IRQ, |
67 | }, | 67 | }, |
68 | { | 68 | { |
69 | .start = 128 + 29, | 69 | .start = MCF_IRQ_FECENTC1, |
70 | .end = 128 + 29, | 70 | .end = MCF_IRQ_FECENTC1, |
71 | .flags = IORESOURCE_IRQ, | 71 | .flags = IORESOURCE_IRQ, |
72 | }, | 72 | }, |
73 | }; | 73 | }; |