Skip to contentSkip to conversation

Net: Clean up LAN91C96 Support

PATCH New Ben Warren 1 participant 2 messages Dec 15, 2009

lore
Share & tools
lore

Ben Warren

author
#0 lore raw

PATCH 1/1 Net: Clean up LAN91C96 Support

A previous Commit converted the LAN91C96 Ethernet driver to using the CONFIG_NET_MULTI API, but did not include full board support. This patch finishes the job.

---
This patch applies to the net/next tree and is necessary to complete previously- submitted code in that tree

 board/apollon/apollon.c                  |    1 -
 board/assabet/assabet.c                  |   12 ++++++++++++
 board/dave/B2/B2.c                       |   12 ++++++++++++
 board/gcplus/gcplus.c                    |   12 ++++++++++++
 board/logicpd/zoom1/zoom1.c              |   12 ++++++++++++
 board/logicpd/zoom2/zoom2.c              |   12 ++++++++++++
 board/lubbock/lubbock.c                  |   12 ++++++++++++
 board/ti/omap1510inn/omap1510innovator.c |   12 ++++++++++++
 board/ti/omap1610inn/omap1610innovator.c |   12 ++++++++++++
 board/ti/omap2420h4/omap2420h4.c         |   12 ++++++++++++
 board/ti/omap5912osk/omap5912osk.c       |   12 ++++++++++++
 board/ti/omap730p2/omap730p2.c           |   12 ++++++++++++
 board/ti/sdp3430/sdp.c                   |    1 +
 include/configs/B2.h                     |    2 +-
 14 files changed, 134 insertions(+), 2 deletions(-)
board/apollon/apollon.c +0 -1
index b93e880..4768f58 100644
@@ -95,7 +95,6 @@ void s_init(void)
  ********************************************************/
 int misc_init_r(void)
 {
-	ether_init();		/* better done here so timers are init'ed */
 	return (0);
 }
 
board/assabet/assabet.c +12 -0
index 6f02db2..753c8d2 100644
@@ -25,6 +25,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include <SA-1100.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -117,3 +118,14 @@ dram_init(void)
 
 	return (0);
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/dave/B2/B2.c +12 -0
index ec742ad..096ebbd 100644
@@ -25,6 +25,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include <asm/hardware.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -125,3 +126,14 @@ int dram_init (void)
 
 	return (0);
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/gcplus/gcplus.c +12 -0
index 829b597..71607f2 100644
@@ -25,6 +25,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include <SA-1100.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -68,3 +69,14 @@ dram_init(void)
 
 	return (0);
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/logicpd/zoom1/zoom1.c +12 -0
index f4d3754..a144f52 100644
@@ -31,6 +31,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
+#include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
 #include <asm/arch/mux.h>
@@ -86,3 +87,14 @@ void set_muxconf_regs(void)
 	/* platform specific muxes */
 	MUX_ZOOM1_MDK();
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/logicpd/zoom2/zoom2.c +12 -0
index dadbeb6..21afc29 100644
@@ -29,6 +29,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
+#include <netdev.h>
 #ifdef CONFIG_STATUS_LED
 #include <status_led.h>
 #endif
@@ -177,3 +178,14 @@ void set_muxconf_regs (void)
 	/* platform specific muxes */
 	MUX_ZOOM2 ();
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/lubbock/lubbock.c +12 -0
index 5829170..d8d6ffb 100644
@@ -26,6 +26,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -68,3 +69,14 @@ int dram_init (void)
 
 	return 0;
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/ti/omap1510inn/omap1510innovator.c +12 -0
index 8941209..2cb6062 100644
@@ -30,6 +30,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -127,3 +128,14 @@ int dram_init (void)
 
 	return 0;
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/ti/omap1610inn/omap1610innovator.c +12 -0
index 2e04ad4..44818bb 100644
@@ -32,6 +32,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #if defined(CONFIG_OMAP1610)
 #include <./configs/omap1510.h>
 #endif
@@ -302,3 +303,14 @@ void peripheral_power_enable (void)
 
 	*SW_CLOCK_REQUEST |= UART1_48MHZ_ENABLE;
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/ti/omap2420h4/omap2420h4.c +12 -0
index 8d18239..1c98e1b 100644
@@ -22,6 +22,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>
@@ -842,3 +843,14 @@ void update_mux(u32 btype,u32 mtype)
 		}
 	}
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/ti/omap5912osk/omap5912osk.c +12 -0
index 6993b13..cbf451b 100644
@@ -34,6 +34,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #if defined(CONFIG_OMAP1610)
 #include <./configs/omap1510.h>
 #endif
@@ -306,3 +307,14 @@ int checkboard(void)
 
 	return (0);
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/ti/omap730p2/omap730p2.c +12 -0
index 309d667..954ced5 100644
@@ -30,6 +30,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #if defined(CONFIG_OMAP730)
 #include <./configs/omap730.h>
 #endif
@@ -263,3 +264,14 @@ void peripheral_power_enable (void)
 	*MuxConfReg &= (0xFF1FFFFF);
 	*MuxConfReg &= (0xF1FFFFFF);
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+	return rc;
+}
+#endif
board/ti/sdp3430/sdp.c +1 -0
index 0d8e20d..73db5f1 100644
@@ -23,6 +23,7 @@
  */
 #include <common.h>
 #include <netdev.h>
+#include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
 #include <asm/arch/mux.h>
include/configs/B2.h +1 -1
index d7806e9..f51a261 100644
@@ -98,7 +98,7 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
 
-
+#define CONFIG_NET_MULTI
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ETHADDR	00:50:c2:1e:af:fb
 #define CONFIG_BOOTARGS  "setenv bootargs root=/dev/ram ip=192.168.0.70:::::eth0:off \
Signature · 1 line
1.6.0.4
author
#1 lore raw

PATCH 1/1 Net: Clean up LAN91C96 Support

Quoted 5 lines · Ben Warren

A previous Commit converted the LAN91C96 Ethernet driver to using the CONFIG_NET_MULTI API, but did not include full board support. This patch finishes the job.

Found a bug in my own patch :(
<snip>

board/ti/sdp3430/sdp.c line 27

Quoted 10 lines
board/ti/sdp3430/sdp.c +1 -0
index 0d8e20d..73db5f1 100644
@@ -23,6 +23,7 @@
  */
 #include <common.h>
 #include <netdev.h>
+#include <netdev.h>
 

oops

--Ben