diff options
-rw-r--r-- | arch/m68k/include/asm/m527xsim.h | 10 | ||||
-rw-r--r-- | arch/m68k/platform/527x/config.c | 12 |
2 files changed, 13 insertions, 9 deletions
diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h index 758810ef91ec..7399968b2efe 100644 --- a/arch/m68k/include/asm/m527xsim.h +++ b/arch/m68k/include/asm/m527xsim.h | |||
@@ -40,6 +40,10 @@ | |||
40 | #define MCFINT_QSPI 18 /* Interrupt number for QSPI */ | 40 | #define MCFINT_QSPI 18 /* Interrupt number for QSPI */ |
41 | #define MCFINT_PIT1 36 /* Interrupt number for PIT1 */ | 41 | #define MCFINT_PIT1 36 /* Interrupt number for PIT1 */ |
42 | 42 | ||
43 | #define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0) | ||
44 | #define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1) | ||
45 | #define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2) | ||
46 | |||
43 | /* | 47 | /* |
44 | * SDRAM configuration registers. | 48 | * SDRAM configuration registers. |
45 | */ | 49 | */ |
@@ -72,9 +76,9 @@ | |||
72 | /* | 76 | /* |
73 | * UART module. | 77 | * UART module. |
74 | */ | 78 | */ |
75 | #define MCFUART_BASE1 (MCF_IPSBAR + 0x200) | 79 | #define MCFUART_BASE0 (MCF_IPSBAR + 0x200) |
76 | #define MCFUART_BASE2 (MCF_IPSBAR + 0x240) | 80 | #define MCFUART_BASE1 (MCF_IPSBAR + 0x240) |
77 | #define MCFUART_BASE3 (MCF_IPSBAR + 0x280) | 81 | #define MCFUART_BASE2 (MCF_IPSBAR + 0x280) |
78 | 82 | ||
79 | /* | 83 | /* |
80 | * FEC ethernet module. | 84 | * FEC ethernet module. |
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c index c948a16beea8..56f1ddd3cfdc 100644 --- a/arch/m68k/platform/527x/config.c +++ b/arch/m68k/platform/527x/config.c | |||
@@ -28,16 +28,16 @@ | |||
28 | 28 | ||
29 | static struct mcf_platform_uart m527x_uart_platform[] = { | 29 | static struct mcf_platform_uart m527x_uart_platform[] = { |
30 | { | 30 | { |
31 | .mapbase = MCFUART_BASE1, | 31 | .mapbase = MCFUART_BASE0, |
32 | .irq = MCFINT_VECBASE + MCFINT_UART0, | 32 | .irq = MCF_IRQ_UART0, |
33 | }, | 33 | }, |
34 | { | 34 | { |
35 | .mapbase = MCFUART_BASE2, | 35 | .mapbase = MCFUART_BASE1, |
36 | .irq = MCFINT_VECBASE + MCFINT_UART1, | 36 | .irq = MCF_IRQ_UART1, |
37 | }, | 37 | }, |
38 | { | 38 | { |
39 | .mapbase = MCFUART_BASE3, | 39 | .mapbase = MCFUART_BASE2, |
40 | .irq = MCFINT_VECBASE + MCFINT_UART2, | 40 | .irq = MCF_IRQ_UART2, |
41 | }, | 41 | }, |
42 | { }, | 42 | { }, |
43 | }; | 43 | }; |