Commit b1c0eaac authored by Ben Warren's avatar Ben Warren

Convert CS8900 Ethernet driver to CONFIG_NET_MULTI API

All in-tree boards that use this controller have CONFIG_NET_MULTI added
Also:
  - changed CONFIG_DRIVER_CS8900 to CONFIG_CS8900
  - changed CS8900_BASE to CONFIG_CS8900_BASE
  - changed CS8900_BUS?? to CONFIG_CS8900_BUS??
  - cleaned up line lengths
  - modified VCMA9 command function that accesses the device
  - removed MAC address initialization from lib_arm/board.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
Tested-by: default avatarWolfgang Denk <wd@denx.de>
Acked-by: default avatarWolfgang Denk <wd@denx.de>
parent d47628a6
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <nios-io.h> #include <nios-io.h>
#if defined(CONFIG_SEVENSEG) #if defined(CONFIG_SEVENSEG)
#include "../common/sevenseg.h" #include "../common/sevenseg.h"
...@@ -79,3 +80,14 @@ int ide_preinit (void) ...@@ -79,3 +80,14 @@ int ide_preinit (void)
return 0; return 0;
} }
#endif #endif
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#if defined(CONFIG_SEVENSEG) #if defined(CONFIG_SEVENSEG)
#include "../common/sevenseg.h" #include "../common/sevenseg.h"
#endif #endif
...@@ -58,3 +59,14 @@ phys_size_t initdram (int board_type) ...@@ -58,3 +59,14 @@ phys_size_t initdram (int board_type)
{ {
return (0); return (0);
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <clps7111.h> #include <clps7111.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -58,3 +59,14 @@ int dram_init (void) ...@@ -58,3 +59,14 @@ int dram_init (void)
return (0); return (0);
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -151,3 +152,14 @@ void show_boot_progress (int status) ...@@ -151,3 +152,14 @@ void show_boot_progress (int status)
return; return;
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <clps7111.h> #include <clps7111.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -52,3 +53,14 @@ int dram_init (void) ...@@ -52,3 +53,14 @@ int dram_init (void)
return (0); return (0);
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/mx31.h> #include <asm/arch/mx31.h>
#include <asm/arch/mx31-regs.h> #include <asm/arch/mx31-regs.h>
...@@ -104,3 +105,14 @@ int checkboard (void) ...@@ -104,3 +105,14 @@ int checkboard (void)
printf("Board: MX31ADS\n"); printf("Board: MX31ADS\n");
return 0; return 0;
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <clps7111.h> #include <clps7111.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -57,3 +58,14 @@ int dram_init (void) ...@@ -57,3 +58,14 @@ int dram_init (void)
return (0); return (0);
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -62,3 +63,14 @@ int dram_init (void) ...@@ -62,3 +63,14 @@ int dram_init (void)
return (0); return (0);
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "vcma9.h" #include "vcma9.h"
#include "../common/common_util.h" #include "../common/common_util.h"
#if defined(CONFIG_DRIVER_CS8900) #if defined(CONFIG_CS8900)
#include <../drivers/net/cs8900.h> #include <../drivers/net/cs8900.h>
static uchar cs8900_chksum(ushort data) static uchar cs8900_chksum(ushort data)
...@@ -56,25 +56,33 @@ extern int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); ...@@ -56,25 +56,33 @@ extern int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
struct eth_device *dev;
char cs8900_name[10];
if (strcmp(argv[1], "info") == 0) if (strcmp(argv[1], "info") == 0)
{ {
print_vcma9_info(); print_vcma9_info();
return 0; return 0;
} }
#if defined(CONFIG_DRIVER_CS8900) #if defined(CONFIG_CS8900)
if (strcmp(argv[1], "cs8900") == 0) { if (strcmp(argv[1], "cs8900") == 0) {
sprintf(cs8900_name, "%s-0", CS8900_DRIVERNAME);
dev = eth_get_dev_by_name(cs8900_name);
if (!dev) {
printf("Couldn't find CS8900 driver");
return 0;
}
if (strcmp(argv[2], "read") == 0) { if (strcmp(argv[2], "read") == 0) {
uchar addr; ushort data; uchar addr; ushort data;
addr = simple_strtoul(argv[3], NULL, 16); addr = simple_strtoul(argv[3], NULL, 16);
cs8900_e2prom_read(addr, &data); cs8900_e2prom_read(dev, addr, &data);
printf("0x%2.2X: 0x%4.4X\n", addr, data); printf("0x%2.2X: 0x%4.4X\n", addr, data);
} else if (strcmp(argv[2], "write") == 0) { } else if (strcmp(argv[2], "write") == 0) {
uchar addr; ushort data; uchar addr; ushort data;
addr = simple_strtoul(argv[3], NULL, 16); addr = simple_strtoul(argv[3], NULL, 16);
data = simple_strtoul(argv[4], NULL, 16); data = simple_strtoul(argv[4], NULL, 16);
cs8900_e2prom_write(addr, data); cs8900_e2prom_write(dev, addr, data);
} else if (strcmp(argv[2], "setaddr") == 0) { } else if (strcmp(argv[2], "setaddr") == 0) {
uchar addr, i, csum; ushort data; uchar addr, i, csum; ushort data;
uchar ethaddr[6]; uchar ethaddr[6];
...@@ -83,22 +91,22 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ...@@ -83,22 +91,22 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if (eth_getenv_enetaddr("ethaddr", ethaddr)) { if (eth_getenv_enetaddr("ethaddr", ethaddr)) {
addr = 1; addr = 1;
data = 0x2158; data = 0x2158;
cs8900_e2prom_write(addr, data); cs8900_e2prom_write(dev, addr, data);
csum = cs8900_chksum(data); csum = cs8900_chksum(data);
addr++; addr++;
for (i = 0; i < 6; i+=2) { for (i = 0; i < 6; i+=2) {
data = ethaddr[i+1] << 8 | data = ethaddr[i+1] << 8 |
ethaddr[i]; ethaddr[i];
cs8900_e2prom_write(addr, data); cs8900_e2prom_write(dev, addr, data);
csum += cs8900_chksum(data); csum += cs8900_chksum(data);
addr++; addr++;
} }
/* calculate header link byte */ /* calculate header link byte */
data = 0xA100 | (addr * 2); data = 0xA100 | (addr * 2);
cs8900_e2prom_write(0, data); cs8900_e2prom_write(dev, 0, data);
csum += cs8900_chksum(data); csum += cs8900_chksum(data);
/* write checksum word */ /* write checksum word */
cs8900_e2prom_write(addr, (0 - csum) << 8); cs8900_e2prom_write(dev, addr, (0 - csum) << 8);
} else { } else {
puts("\nplease defined 'ethaddr'\n"); puts("\nplease defined 'ethaddr'\n");
} }
...@@ -106,12 +114,12 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ...@@ -106,12 +114,12 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
uchar addr = 0, endaddr, csum; ushort data; uchar addr = 0, endaddr, csum; ushort data;
puts("Dump of CS8900 config device: "); puts("Dump of CS8900 config device: ");
cs8900_e2prom_read(addr, &data); cs8900_e2prom_read(dev, addr, &data);
if ((data & 0xE000) == 0xA000) { if ((data & 0xE000) == 0xA000) {
endaddr = (data & 0x00FF) / 2; endaddr = (data & 0x00FF) / 2;
csum = cs8900_chksum(data); csum = cs8900_chksum(data);
for (addr = 1; addr <= endaddr; addr++) { for (addr = 1; addr <= endaddr; addr++) {
cs8900_e2prom_read(addr, &data); cs8900_e2prom_read(dev, addr, &data);
printf("\n0x%2.2X: 0x%4.4X", addr, data); printf("\n0x%2.2X: 0x%4.4X", addr, data);
csum += cs8900_chksum(data); csum += cs8900_chksum(data);
} }
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <s3c2410.h> #include <s3c2410.h>
#include <stdio_dev.h> #include <stdio_dev.h>
#include <i2c.h> #include <i2c.h>
...@@ -349,3 +350,14 @@ void print_vcma9_info(void) ...@@ -349,3 +350,14 @@ void print_vcma9_info(void)
Show_VCMA9_Info(s, &s[6]); Show_VCMA9_Info(s, &s[6]);
} }
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
/*#include <mc9328.h>*/ /*#include <mc9328.h>*/
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
...@@ -167,3 +168,14 @@ int dram_init (void) ...@@ -167,3 +168,14 @@ int dram_init (void)
return 0; return 0;
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <s3c2400.h> #include <s3c2400.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -110,3 +111,14 @@ static int key_pressed(void) ...@@ -110,3 +111,14 @@ static int key_pressed(void)
return rc; return rc;
} }
#endif /* CONFIG_MODEM_SUPPORT */ #endif /* CONFIG_MODEM_SUPPORT */
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <s3c2410.h> #include <s3c2410.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -121,3 +122,14 @@ int dram_init (void) ...@@ -121,3 +122,14 @@ int dram_init (void)
return 0; return 0;
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <s3c6400.h> #include <s3c6400.h>
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
...@@ -117,3 +118,14 @@ ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t *info) ...@@ -117,3 +118,14 @@ ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t *info)
} else } else
return 0; return 0;
} }
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <s3c2410.h> #include <s3c2410.h>
#if defined(CONFIG_CMD_NAND) #if defined(CONFIG_CMD_NAND)
...@@ -178,3 +179,14 @@ void nand_init(void) ...@@ -178,3 +179,14 @@ void nand_init(void)
printf ("%4lu MB\n", nand_probe((ulong)nand) >> 20); printf ("%4lu MB\n", nand_probe((ulong)nand) >> 20);
} }
#endif #endif
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
*/ */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <nios-io.h> #include <nios-io.h>
#include <spi.h> #include <spi.h>
...@@ -100,3 +101,14 @@ int post_hotkeys_pressed(void) ...@@ -100,3 +101,14 @@ int post_hotkeys_pressed(void)
return 0; /* No hotkeys supported */ return 0; /* No hotkeys supported */
} }
#endif /* CONFIG_POST */ #endif /* CONFIG_POST */
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
/* #define DEBUG */ /* #define DEBUG */
#include <common.h> #include <common.h>
#include <netdev.h>
#include <malloc.h> #include <malloc.h>
#include <s3c2400.h> #include <s3c2400.h>
#include <command.h> #include <command.h>
...@@ -420,3 +421,14 @@ static void tsc2000_set_brightness(void) ...@@ -420,3 +421,14 @@ static void tsc2000_set_brightness(void)
tsc2000_write(0, 0xb, br & 0xff); tsc2000_write(0, 0xb, br & 0xff);
} }
#endif #endif
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
int rc = 0;
#ifdef CONFIG_CS8900
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
#endif
return rc;
}
#endif
...@@ -30,7 +30,7 @@ COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o ...@@ -30,7 +30,7 @@ COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
COBJS-$(CONFIG_DRIVER_AX88180) += ax88180.o COBJS-$(CONFIG_DRIVER_AX88180) += ax88180.o
COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o
COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o
COBJS-$(CONFIG_DRIVER_CS8900) += cs8900.o COBJS-$(CONFIG_CS8900) += cs8900.o
COBJS-$(CONFIG_TULIP) += dc2114x.o