From 2b3068550ff6e7d38509268bc4d3fbf082a90dd8 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Sat, 24 Dec 2011 12:36:38 +1000
Subject: [PATCH] --- yaml --- r: 292443 b: refs/heads/master c:
 36d175a4b249235927d75fb681484bd97cc4ea41 h: refs/heads/master i:   292441:
 80fda164fe877edd153069e0d0957bf147292ad1   292439:
 fe259d3f2e61a11d4afc8fa73f5f3721b2b3e1e0 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/m68k/include/asm/m523xsim.h | 13 +++++++++++++
 trunk/arch/m68k/include/asm/mcfqspi.h  |  2 +-
 trunk/arch/m68k/platform/523x/config.c | 13 ++++---------
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index fd4a8ab4eb76..147b120626f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4e2e2ac08f73dedeabecb9e1141a05889591b7b
+refs/heads/master: 36d175a4b249235927d75fb681484bd97cc4ea41
diff --git a/trunk/arch/m68k/include/asm/m523xsim.h b/trunk/arch/m68k/include/asm/m523xsim.h
index e1988dd372fe..f2d21cef094c 100644
--- a/trunk/arch/m68k/include/asm/m523xsim.h
+++ b/trunk/arch/m68k/include/asm/m523xsim.h
@@ -51,6 +51,8 @@
 #define	MCF_IRQ_FECTX0		(MCFINT_VECBASE + MCFINT_FECTX0)
 #define	MCF_IRQ_FECENTC0	(MCFINT_VECBASE + MCFINT_FECENTC0)
 
+#define	MCF_IRQ_QSPI		(MCFINT_VECBASE + MCFINT_QSPI)
+
 /*
  *	SDRAM configuration registers.
  */
@@ -82,6 +84,17 @@
 #define	MCFFEC_BASE0		(MCF_IPSBAR + 0x1000)
 #define	MCFFEC_SIZE0		0x800
 
+/*
+ *  QSPI module.
+ */
+#define	MCFQSPI_BASE		(MCF_IPSBAR + 0x340)
+#define	MCFQSPI_SIZE		0x40
+
+#define	MCFQSPI_CS0		91
+#define	MCFQSPI_CS1		92
+#define	MCFQSPI_CS2		103
+#define	MCFQSPI_CS3		99
+
 /*
  *  GPIO module.
  */
diff --git a/trunk/arch/m68k/include/asm/mcfqspi.h b/trunk/arch/m68k/include/asm/mcfqspi.h
index 34a531ed2bd1..62148b72825e 100644
--- a/trunk/arch/m68k/include/asm/mcfqspi.h
+++ b/trunk/arch/m68k/include/asm/mcfqspi.h
@@ -21,7 +21,7 @@
 #ifndef mcfqspi_h
 #define mcfqspi_h
 
-#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
+#if defined(CONFIG_M527x) || defined(CONFIG_M528x)
 #define	MCFQSPI_IOBASE		(MCF_IPSBAR + 0x340)
 #elif defined(CONFIG_M5249)
 #define MCFQSPI_IOBASE         (MCF_MBAR + 0x300)
diff --git a/trunk/arch/m68k/platform/523x/config.c b/trunk/arch/m68k/platform/523x/config.c
index 900d35c49ebf..bd8a6fd4e993 100644
--- a/trunk/arch/m68k/platform/523x/config.c
+++ b/trunk/arch/m68k/platform/523x/config.c
@@ -29,22 +29,17 @@
 #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)
 static struct resource m523x_qspi_resources[] = {
 	{
-		.start		= MCFQSPI_IOBASE,
-		.end		= MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1,
+		.start		= MCFQSPI_BASE,
+		.end		= MCFQSPI_BASE + MCFQSPI_SIZE - 1,
 		.flags		= IORESOURCE_MEM,
 	},
 	{
-		.start		= MCFINT_VECBASE + MCFINT_QSPI,
-		.end		= MCFINT_VECBASE + MCFINT_QSPI,
+		.start		= MCF_IRQ_QSPI,
+		.end		= MCF_IRQ_QSPI,
 		.flags		= IORESOURCE_IRQ,
 	},
 };
 
-#define MCFQSPI_CS0    91
-#define MCFQSPI_CS1    92
-#define MCFQSPI_CS2    103
-#define MCFQSPI_CS3    99
-
 static int m523x_cs_setup(struct mcfqspi_cs_control *cs_control)
 {
 	int status;