Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / m68k / include / asm / m525xsim.h

diff --git a/arch/m68k/include/asm/m525xsim.h b/arch/m68k/include/asm/m525xsim.h
index e33f5bb6aca88865d0e389114b112e5e79a27e96..f186459072e9b0042fbf413d9224367350adcfa6 100644 (file)
--- a/arch/m68k/include/asm/m525xsim.h
+++ b/arch/m68k/include/asm/m525xsim.h
@@ -105,7 +105,7 @@
 /*
  *     QSPI module.
  */
-#define MCFQSPI_BASE           (MCF_MBAR + 0x300)      /* Base address QSPI */
+#define MCFQSPI_BASE           (MCF_MBAR + 0x400)      /* Base address QSPI */
 #define MCFQSPI_SIZE           0x40                    /* Register set size */
 
 #ifdef CONFIG_M5249