aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Ungerer <greg.ungerer@opengear.com>2011-09-10 18:40:34 +1000
committerWolfgang Denk <wd@denx.de>2011-09-10 16:10:34 +0200
commit1e8ff7145c6be51f295d8e235472a6455aee1ac3 (patch)
tree15ec96b5a54c6b985e79310b9d2ba852c4fda137
parenta00e749d5b172b69bcf84e5fee36b2d20ee67b10 (diff)
downloadu-boot-linaro-stable-1e8ff7145c6be51f295d8e235472a6455aee1ac3.tar.gz
KS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH
Trivial conversion of the ks8695eth driver to a CONFIG_MULTI_ETH type driver. Signed-off-by: Greg Ungerer <greg.ungerer@opengear.com>
-rw-r--r--board/cm4008/cm4008.c4
-rw-r--r--board/cm41xx/cm41xx.c4
-rw-r--r--drivers/net/ks8695eth.c42
-rw-r--r--include/configs/cm4008.h1
-rw-r--r--include/configs/cm41xx.h1
-rw-r--r--include/netdev.h1
6 files changed, 39 insertions, 14 deletions
diff --git a/board/cm4008/cm4008.c b/board/cm4008/cm4008.c
index 63296f092..2e8d94805 100644
--- a/board/cm4008/cm4008.c
+++ b/board/cm4008/cm4008.c
@@ -74,6 +74,10 @@ int board_late_init (void)
return 0;
}
+int board_eth_init(bd_t *bis)
+{
+ return ks8695_eth_initialize();
+}
int board_init (void)
{
diff --git a/board/cm41xx/cm41xx.c b/board/cm41xx/cm41xx.c
index 9a6d89fdc..72fd64d5b 100644
--- a/board/cm41xx/cm41xx.c
+++ b/board/cm41xx/cm41xx.c
@@ -74,6 +74,10 @@ int board_late_init (void)
return 0;
}
+int board_eth_init(bd_t *bis)
+{
+ return ks8695_eth_initialize();
+}
int board_init (void)
{
diff --git a/drivers/net/ks8695eth.c b/drivers/net/ks8695eth.c
index 5ea6e7fda..cd368808f 100644
--- a/drivers/net/ks8695eth.c
+++ b/drivers/net/ks8695eth.c
@@ -99,7 +99,7 @@ void ks8695_getmac(void)
/****************************************************************************/
-void eth_reset(bd_t *bd)
+static int ks8695_eth_init(struct eth_device *dev, bd_t *bd)
{
int i;
@@ -151,21 +151,12 @@ void eth_reset(bd_t *bd)
ks8695_write(KS8695_LAN_DMA_RX_START, 0x1);
printf("KS8695 ETHERNET: %pM\n", eth_mac);
-}
-
-/****************************************************************************/
-
-int eth_init(bd_t *bd)
-{
- debug ("%s(%d): eth_init()\n", __FILE__, __LINE__);
-
- eth_reset(bd);
return 0;
}
/****************************************************************************/
-void eth_halt(void)
+static void ks8695_eth_halt(struct eth_device *dev)
{
debug ("%s(%d): eth_halt()\n", __FILE__, __LINE__);
@@ -176,7 +167,7 @@ void eth_halt(void)
/****************************************************************************/
-int eth_rx(void)
+static int ks8695_eth_recv(struct eth_device *dev)
{
volatile struct ks8695_rxdesc *dp;
int i, len = 0;
@@ -199,7 +190,8 @@ int eth_rx(void)
/****************************************************************************/
-int eth_send(volatile void *packet, int len)
+static int ks8695_eth_send(struct eth_device *dev, volatile void *packet,
+ int len)
{
volatile struct ks8695_txdesc *dp;
static int next = 0;
@@ -224,5 +216,27 @@ int eth_send(volatile void *packet, int len)
if (++next >= TXDESCS)
next = 0;
- return len;
+ return 0;
+}
+
+/****************************************************************************/
+
+int ks8695_eth_initialize(void)
+{
+ struct eth_device *dev;
+
+ dev = malloc(sizeof(*dev));
+ if (dev == NULL)
+ return -1;
+ memset(dev, 0, sizeof(*dev));
+
+ dev->iobase = KS8695_IO_BASE + KS8695_LAN_DMA_TX;
+ dev->init = ks8695_eth_init;
+ dev->halt = ks8695_eth_halt;
+ dev->send = ks8695_eth_send;
+ dev->recv = ks8695_eth_recv;
+ strcpy(dev->name, "ks8695eth");
+
+ eth_register(dev);
+ return 0;
}
diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index 81e4de45d..5777062c6 100644
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -38,6 +38,7 @@
#define CONFIG_INITRD_TAG 1
#define CONFIG_DRIVER_KS8695ETH /* use KS8695 ethernet driver */
+#define CONFIG_NET_MULTI
/*
* Size of malloc() pool
diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index 785ab0a62..66e689aa8 100644
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -38,6 +38,7 @@
#define CONFIG_INITRD_TAG 1
#define CONFIG_DRIVER_KS8695ETH /* use KS8695 ethernet driver */
+#define CONFIG_NET_MULTI
/*
* Size of malloc() pool
diff --git a/include/netdev.h b/include/netdev.h
index 6f0a971b7..83d78861c 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -66,6 +66,7 @@ int ftmac100_initialize(bd_t *bits);
int greth_initialize(bd_t *bis);
void gt6426x_eth_initialize(bd_t *bis);
int inca_switch_initialize(bd_t *bis);
+int ks8695_eth_initialize(bd_t *bis);
int lan91c96_initialize(u8 dev_num, int base_addr);
int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
int mcdmafec_initialize(bd_t *bis);