Merge branch 'linus' into perf/urgent

Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 16 insertions, 2 deletions

diff --git a/arch/m68k/include/asm/m5249sim.h b/arch/m68k/include/asm/m5249sim.h
index 805714ca8d7d..7f0c2c3660fd 100644
--- a/arch/m68k/include/asm/m5249sim.h
+++ b/arch/m68k/include/asm/m5249sim.h
@@ -76,8 +76,19 @@
 /*
  *      UART module.
  */
-#define MCFUART_BASE1           0x1c0           /* Base address of UART1 */
-#define MCFUART_BASE2           0x200           /* Base address of UART2 */
+#define MCFUART_BASE0           (MCF_MBAR + 0x1c0)      /* Base address UART0 */
+#define MCFUART_BASE1           (MCF_MBAR + 0x200)      /* Base address UART1 */
+
+/*
+ *      QSPI module.
+ */
+#define MCFQSPI_BASE            (MCF_MBAR + 0x300)      /* Base address QSPI */
+#define MCFQSPI_SIZE            0x40                    /* Register set size */
+
+#define MCFQSPI_CS0             29
+#define MCFQSPI_CS1             24
+#define MCFQSPI_CS2             21
+#define MCFQSPI_CS3             22
 
 /*
  *      DMA unit base addresses.
@@ -108,6 +119,9 @@
 #define MCF_IRQ_TIMER           30              /* Timer0, Level 6 */
 #define MCF_IRQ_PROFILER        31              /* Timer1, Level 7 */
 
+#define MCF_IRQ_UART0           73              /* UART0 */
+#define MCF_IRQ_UART1           74              /* UART1 */
+
 /*
  *      General purpose IO registers (in MBAR2).
  */