From ebc4f70662d1046b5299c9adb24119700e354310 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Sat, 24 Dec 2011 10:13:36 +1000
Subject: [PATCH] --- yaml --- r: 292437 b: refs/heads/master c:
 9a11b493edcc4b740bac5ccbe9167e4ef12e4668 h: refs/heads/master i:   292435:
 896e639b05bd25be5580807cba324d43571f00ad v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/m68k/include/asm/m5272sim.h |  9 ++++++---
 trunk/arch/m68k/platform/5272/config.c | 16 ++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index c23e628016d1..f52e4ddfea56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21634593b42308631788359cba9d7671383ae762
+refs/heads/master: 9a11b493edcc4b740bac5ccbe9167e4ef12e4668
diff --git a/trunk/arch/m68k/include/asm/m5272sim.h b/trunk/arch/m68k/include/asm/m5272sim.h
index 5c71bd4c746d..a58f1760d858 100644
--- a/trunk/arch/m68k/include/asm/m5272sim.h
+++ b/trunk/arch/m68k/include/asm/m5272sim.h
@@ -88,6 +88,9 @@
 #define	MCFTIMER_BASE3		(MCF_MBAR + 0x240) /* Base address TIMER4 */
 #define	MCFTIMER_BASE4		(MCF_MBAR + 0x260) /* Base address TIMER3 */
 
+#define	MCFFEC_BASE0		(MCF_MBAR + 0x840) /* Base FEC ethernet */
+#define	MCFFEC_SIZE0		0x1d0
+
 /*
  *	Define system peripheral IRQ usage.
  */
@@ -114,9 +117,9 @@
 #define	MCF_IRQ_USB6		83		/* USB Endpoint 6 */
 #define	MCF_IRQ_USB7		84		/* USB Endpoint 7 */
 #define	MCF_IRQ_DMA		85		/* DMA Controller */
-#define	MCF_IRQ_ERX		86		/* Ethernet Receiver */
-#define	MCF_IRQ_ETX		87		/* Ethernet Transmitter */
-#define	MCF_IRQ_ENTC		88		/* Ethernet Non-Time Critical */
+#define	MCF_IRQ_FECRX0		86		/* Ethernet Receiver */
+#define	MCF_IRQ_FECTX0		87		/* Ethernet Transmitter */
+#define	MCF_IRQ_FECENTC0	88		/* Ethernet Non-Time Critical */
 #define	MCF_IRQ_QSPI		89		/* Queued Serial Interface */
 #define	MCF_IRQ_EINT5		90		/* External Interrupt 5 */
 #define	MCF_IRQ_EINT6		91		/* External Interrupt 6 */
diff --git a/trunk/arch/m68k/platform/5272/config.c b/trunk/arch/m68k/platform/5272/config.c
index c7c2c422a1fc..4b6bc60baee3 100644
--- a/trunk/arch/m68k/platform/5272/config.c
+++ b/trunk/arch/m68k/platform/5272/config.c
@@ -32,23 +32,23 @@ unsigned char ledbank = 0xff;
 
 static struct resource m5272_fec_resources[] = {
 	{
-		.start		= MCF_MBAR + 0x840,
-		.end		= MCF_MBAR + 0x840 + 0x1cf,
+		.start		= MCFFEC_BASE0,
+		.end		= MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,
 		.flags		= IORESOURCE_MEM,
 	},
 	{
-		.start		= MCF_IRQ_ERX,
-		.end		= MCF_IRQ_ERX,
+		.start		= MCF_IRQ_FECRX0,
+		.end		= MCF_IRQ_FECRX0,
 		.flags		= IORESOURCE_IRQ,
 	},
 	{
-		.start		= MCF_IRQ_ETX,
-		.end		= MCF_IRQ_ETX,
+		.start		= MCF_IRQ_FECTX0,
+		.end		= MCF_IRQ_FECTX0,
 		.flags		= IORESOURCE_IRQ,
 	},
 	{
-		.start		= MCF_IRQ_ENTC,
-		.end		= MCF_IRQ_ENTC,
+		.start		= MCF_IRQ_FECENTC0,
+		.end		= MCF_IRQ_FECENTC0,
 		.flags		= IORESOURCE_IRQ,
 	},
 };