LAN91C96: Enable NET_MULTI LAN driver

This modification is NOT tested on any of the
platforms modified as I dont have them. please
help by testing+building+fixing

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

diff --git a/board/apollon/apollon.c b/board/apollon/apollon.c
index 8964eba7f862dfd5b0b352bda8d278ba3869a935..b93e880886b2dab8ede11e01e77d895dba796965 100644 (file)
--- a/board/apollon/apollon.c
+++ b/board/apollon/apollon.c
@@ -24,6 +24,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
+#include <netdev.h>
 #include <asm/arch/omap2420.h>
 #include <asm/io.h>
 #include <asm/arch/bits.h>
@@ -138,13 +139,14 @@ void wait_for_command_complete(unsigned int wd_base)
 }
 
 /*******************************************************************
- * Routine:ether_init
+ * Routine:board_eth_init
  * Description: take the Ethernet controller out of reset and wait
  *                for the EEPROM load to complete.
  ******************************************************************/
-void ether_init(void)
+int board_eth_init(bd_t *bis)
 {
-#ifdef CONFIG_DRIVER_LAN91C96
+       int rc = 0;
+#ifdef CONFIG_LAN91C96
        int cnt = 20;
 
        __raw_writeb(0x03, OMAP2420_CTRL_BASE + 0x0f2); /*protect->gpio74 */
@@ -171,10 +173,10 @@ void ether_init(void)
 
        mask_config_reg(ETH_CONTROL_REG, 0x01);
        udelay(1000);
-
+       rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
 eth_reset_err_out:
-       return;
 #endif
+       return rc;
 }
 
 /**********************************************

diff --git a/include/configs/B2.h b/include/configs/B2.h
index e5439f3b54ae9d5c98ab407bf9a36610e389e0e2..d7806e962899e5e2f4b68b9c7fd5dc3d9efdba6d 100644 (file)
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -58,7 +58,7 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE           0x04000300 /* base address         */
 #define CONFIG_SMC_USE_32_BIT
 #undef  CONFIG_SHOW_ACTIVITY

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index adab45422381b0bbfdfdbc58552869920bd79144..ed14f7aa68d24055144ee5b1f3cf1c76d9b07739 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -88,7 +88,8 @@
 /*
  * SMC91c96 Etherent
  */
-#define        CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define        CONFIG_LAN91C96
 #define        CONFIG_LAN91C96_BASE    (APOLLON_CS1_BASE+0x300)
 #define        CONFIG_LAN91C96_EXT_PHY
 

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 8c5b84cf6963864e04aefe974e0281bad0c6ab8d..d17d4bd968bd926cdb05cdc74f756010370eaa77 100644 (file)
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -53,7 +53,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96 /* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96        /* we have an SMC9194 on-board */
 #define CONFIG_LAN91C96_BASE   0x18000000
 
 /*

diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 85db4f5c773bee8750be018b4f9afe3e38531d49..41294b9be62a64505dbfa50c0770820c24af105d 100644 (file)
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -66,7 +66,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96 /* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96        /* we have an SMC9194 on-board */
 #define CONFIG_LAN91C96_BASE   0x100e0000
 
 /*

diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 43913cada9686c6a91aa454300e4ff21975cbb59..0a6921044c78da2301f1f97e065a03cb3dea8183 100644 (file)
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -58,7 +58,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x0C000000
 
 /*

diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 8408209d6c27ae5646f1c363c6510b26e234a3ca..b0ebafd7bd0e2a37c410bc0069f977489adaf8b0 100644 (file)
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -60,7 +60,8 @@
 #define CONFIG_SMC9196_BASE 0x08000300
 #define CONFIG_SMC9196_EXT_PHY
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x08000300
 #define CONFIG_LAN91C96_EXT_PHY
 

diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 42e0198316682fa4c9812e75f76b95982d1b4361..0bbb5b35c155c162851572860a0b49a5f99017e4 100644 (file)
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -57,7 +57,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 

diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index 22c873e0ca0886075789ec33d1a5892c6aef3310..832dd426b6ebc518894f7375fca7d884ffbe4796 100644 (file)
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -58,7 +58,8 @@
  */
 /*
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 

diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 9c1884244e8f553b58ec185474fee222dd18c5fb..6ab44387a677026c815bf84a435fd8f59a207800 100644 (file)
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -81,7 +81,8 @@
 /*
  * SMC91c96 Etherent
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE     (H4_CS1_BASE+0x300)
 #define CONFIG_LAN91C96_EXT_PHY
 

diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index d0ce9dc91564cec5ac310210602b647dd60968da..bc660e39e829a86c5fdde4ab331168e60a01692c 100644 (file)
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -61,7 +61,8 @@
  */
 /*
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04800300
 #define CONFIG_LAN91C96_EXT_PHY
 

diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index 32a9b2397b1ec3e708c3d9e3c2da6f7eb3f5b1bf..a6a8a023f1b0ee40a5703a4f2442287276cf2cf1 100644 (file)
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -65,7 +65,8 @@
  * Hardware drivers
  */
 
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE      0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 

diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index 635ef71bc92c663b8829506b7b6908c55382b107..9e694118c5dae00864c02702b762f8c19bb4e546 100644 (file)
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -56,8 +56,10 @@
  */
 
 /* None - PLEB 2 doesn't have any of this.
-   #define CONFIG_DRIVER_LAN91C96
-   #define CONFIG_LAN91C96_BASE 0x0C000000 */
+       #define CONFIG_NET_MULTI
+       #define CONFIG_LAN91C96
+       #define CONFIG_LAN91C96_BASE 0x0C000000
+ */
 
 /*
  * select serial console configuration