3 files changed, 50 insertions, 3 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9e6933a5088e..279ec625cec4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -822,7 +822,7 @@ config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00)
+        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN)
         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/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index 042e27e291cd..b112317f033e 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -38,7 +38,7 @@
 #define DRV_VERSION "1.0-ko"
 
 /* Firmware version */
-#define FW_VERSION_MAJOR 3
-#define FW_VERSION_MINOR 3
+#define FW_VERSION_MAJOR 4
+#define FW_VERSION_MINOR 0
 #define FW_VERSION_MICRO 0
 #endif                          /* __CHELSIO_VERSION_H */
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index d2767e6584a9..7053026d6c76 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -55,6 +55,53 @@
 #define SMC_insw(a, r, p, l)    readsw((a) + (r), p, l)
 #define SMC_outsw(a, r, p, l)   writesw((a) + (r), p, l)
 
+#elif defined(CONFIG_BFIN)
+
+#define SMC_IRQ_FLAGS           IRQF_TRIGGER_HIGH
+
+# if defined (CONFIG_BFIN561_EZKIT)
+#define SMC_CAN_USE_8BIT        0
+#define SMC_CAN_USE_16BIT       1
+#define SMC_CAN_USE_32BIT       1
+#define SMC_IO_SHIFT            0
+#define SMC_NOWAIT              1
+#define SMC_USE_BFIN_DMA        0
+
+
+#define SMC_inw(a, r)           readw((a) + (r))
+#define SMC_outw(v, a, r)       writew(v, (a) + (r))
+#define SMC_inl(a, r)           readl((a) + (r))
+#define SMC_outl(v, a, r)       writel(v, (a) + (r))
+#define SMC_outsl(a, r, p, l)   outsl((unsigned long *)((a) + (r)), p, l)
+#define SMC_insl(a, r, p, l)    insl ((unsigned long *)((a) + (r)), p, l)
+# else
+#define SMC_CAN_USE_8BIT        0
+#define SMC_CAN_USE_16BIT       1
+#define SMC_CAN_USE_32BIT       0
+#define SMC_IO_SHIFT            0
+#define SMC_NOWAIT              1
+#define SMC_USE_BFIN_DMA        0
+
+
+#define SMC_inw(a, r)           readw((a) + (r))
+#define SMC_outw(v, a, r)       writew(v, (a) + (r))
+#define SMC_outsw(a, r, p, l)   outsw((unsigned long *)((a) + (r)), p, l)
+#define SMC_insw(a, r, p, l)    insw ((unsigned long *)((a) + (r)), p, l)
+# endif
+/* check if the mac in reg is valid */
+#define SMC_GET_MAC_ADDR(addr)                                  \
+        do {                                                    \
+                unsigned int __v;                               \
+                __v = SMC_inw(ioaddr, ADDR0_REG);               \
+                addr[0] = __v; addr[1] = __v >> 8;              \
+                __v = SMC_inw(ioaddr, ADDR1_REG);               \
+                addr[2] = __v; addr[3] = __v >> 8;              \
+                __v = SMC_inw(ioaddr, ADDR2_REG);               \
+                addr[4] = __v; addr[5] = __v >> 8;              \
+                if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) {         \
+                        random_ether_addr(addr);                \
+                }                                               \
+        } while (0)
 #elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6)
 
 /* We can only do 16-bit reads and writes in the static memory space. */