From 5505ea29184711dc2e9643f860e3c6f8ea06fb6f Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Wed, 10 Mar 2010 07:37:06 -0800
Subject: [PATCH] --- yaml --- r: 187993 b: refs/heads/master c:
 717ea4b3474852057b1ce2c639ce219f4f8d3a8d h: refs/heads/master i:   187991:
 02a55e9560c93a20df26ea024c3d3f9ccdc6216f v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/Kconfig  |  2 +-
 trunk/drivers/net/smc91x.h | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c47ca177d950..00e8ccc09e0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f29a3baa825725d29db399663790d15c78cddcf
+refs/heads/master: 717ea4b3474852057b1ce2c639ce219f4f8d3a8d
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index 7029cd50c458..0ba5b8e50a7c 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -907,7 +907,7 @@ config SMC91X
 	select CRC32
 	select MII
 	depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \
-		MIPS || BLACKFIN || MN10300
+		MIPS || BLACKFIN || MN10300 || COLDFIRE
 	help
 	  This is a driver for SMC's 91x series of Ethernet chipsets,
 	  including the SMC91C94 and the SMC91C111. Say Y if you want it
diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h
index a6ee883d1b0e..8d2772cc42f2 100644
--- a/trunk/drivers/net/smc91x.h
+++ b/trunk/drivers/net/smc91x.h
@@ -344,6 +344,34 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
 
 #define SMC_IRQ_FLAGS		IRQF_TRIGGER_HIGH
 
+#elif defined(CONFIG_COLDFIRE)
+
+#define SMC_CAN_USE_8BIT	0
+#define SMC_CAN_USE_16BIT	1
+#define SMC_CAN_USE_32BIT	0
+#define SMC_NOWAIT		1
+
+static inline void mcf_insw(void *a, unsigned char *p, int l)
+{
+	u16 *wp = (u16 *) p;
+	while (l-- > 0)
+		*wp++ = readw(a);
+}
+
+static inline void mcf_outsw(void *a, unsigned char *p, int l)
+{
+	u16 *wp = (u16 *) p;
+	while (l-- > 0)
+		writew(*wp++, a);
+}
+
+#define SMC_inw(a, r)		_swapw(readw((a) + (r)))
+#define SMC_outw(v, a, r)	writew(_swapw(v), (a) + (r))
+#define SMC_insw(a, r, p, l)	mcf_insw(a + r, p, l)
+#define SMC_outsw(a, r, p, l)	mcf_outsw(a + r, p, l)
+
+#define SMC_IRQ_FLAGS		(IRQF_DISABLED)
+
 #else
 
 /*