[PATCH 2/4] fix rbtx4927 ne2000

[PATCH 2/4] fix rbtx4927 ne2000

[Geoff Levand]

[-- Attachment #1: Type: text/plain, Size: 2 bytes --]




[-- Attachment #2: fix-rbtx4927-ne2000.patch --]
[-- Type: text/x-patch, Size: 1862 bytes --]

fix-rbtx4927-ne2000.patch:

This patch fixes the ne2000 driver to work on rbtx4927 and rbtx4937
boards.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>


Index: linux-2.6.16.1/drivers/net/ne.c
===================================================================
--- linux-2.6.16.1.orig/drivers/net/ne.c	2006-03-23 10:55:43.000000000 -0800
+++ linux-2.6.16.1/drivers/net/ne.c	2006-03-23 14:04:59.000000000 -0800
@@ -53,9 +53,17 @@
 
 #include <asm/system.h>
 #include <asm/io.h>
-
-#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)
-#include <asm/tx4938/rbtx4938.h>
+#if defined(CONFIG_TOSHIBA_RBTX4938)
+# include <asm/tx4938/rbtx4938.h>
+# define RBTX49_BASE 0x07f20280
+# define RBTX49_IRQ RBTX4938_RTL_8019_IRQ
+#elif defined(CONFIG_TOSHIBA_RBTX4927)
+# include <asm/tx4927/toshiba_rbtx4927.h>
+# define RBTX49_BASE RBTX4927_RTL_8019_BASE
+# define RBTX49_IRQ RBTX4927_RTL_8019_IRQ
+#else
+# define RBTX49_BASE 0
+# define RBTX49_IRQ 0
 #endif
 
 #include "8390.h"
@@ -115,9 +123,7 @@
     {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */
     {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */
     {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */
-#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)
     {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}},  /* Toshiba built-in */
-#endif
     {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */
     {NULL,}
 };
@@ -233,10 +239,11 @@
 	sprintf(dev->name, "eth%d", unit);
 	netdev_boot_setup_check(dev);
 
-#ifdef CONFIG_TOSHIBA_RBTX4938
-	dev->base_addr = 0x07f20280;
-	dev->irq = RBTX4938_RTL_8019_IRQ;
-#endif
+	if (RBTX49_BASE) {
+		dev->base_addr = RBTX49_BASE;
+		dev->irq = RBTX49_IRQ;
+	}
+	
 	err = do_ne_probe(dev);
 	if (err)
 		goto out;