Commit ac6b362a authored by Nishanth Menon's avatar Nishanth Menon Committed by Ben Warren

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: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent a1725999
......@@ -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;
}
/**********************************************
......
......@@ -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
......
......@@ -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
......
......@@ -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
/*
......
......@@ -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
/*
......
......@@ -58,7 +58,8 @@
/*
* Hardware drivers
*/
#define CONFIG_DRIVER_LAN91C96
#define CONFIG_NET_MULTI
#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE 0x0C000000
/*
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment