mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-04 02:11:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-net

Browse Source
This commit is contained in:
Wolfgang Denk 2009-11-15 22:50:52 +01:00
commit 3c014f1586
2 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/smc911x.c
View File

@ -243,7 +243,7 @@ int smc911x_initialize(u8 dev_num, int base_addr)
dev = malloc(sizeof(*dev)); dev = malloc(sizeof(*dev));
if (!dev) { if (!dev) {
free(dev); free(dev);
return 0; return -1;
} }
memset(dev, 0, sizeof(*dev)); memset(dev, 0, sizeof(*dev));
@ -271,5 +271,5 @@ int smc911x_initialize(u8 dev_num, int base_addr)
sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num); sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);
eth_register(dev); eth_register(dev);
return 0; return 1;
} }

122
examples/standalone/smc911x_eeprom.c
View File

@ -2,7 +2,7 @@
* smc911x_eeprom.c - EEPROM interface to SMC911x parts. * smc911x_eeprom.c - EEPROM interface to SMC911x parts.
* Only tested on SMSC9118 though ... * Only tested on SMSC9118 though ...
* *
* Copyright 2004-2008 Analog Devices Inc. * Copyright 2004-2009 Analog Devices Inc.
* *
* Licensed under the GPL-2 or later. * Licensed under the GPL-2 or later.
* *
@ -17,8 +17,12 @@
#include <common.h> #include <common.h>
#include <exports.h> #include <exports.h>
#ifdef CONFIG_DRIVER_SMC911X /* the smc911x.h gets base addr through eth_device' iobase */
struct eth_device {
const char *name;
unsigned long iobase;
void *priv;
};
#include "../drivers/net/smc911x.h" #include "../drivers/net/smc911x.h"
/** /**
@ -55,32 +59,32 @@ static void usage(void)
* Registers 0x00 - 0x50 are FIFOs. The 0x50+ are the control registers * Registers 0x00 - 0x50 are FIFOs. The 0x50+ are the control registers
* and they're all 32bits long. 0xB8+ are reserved, so don't bother. * and they're all 32bits long. 0xB8+ are reserved, so don't bother.
*/ */
static void dump_regs(void) static void dump_regs(struct eth_device *dev)
{ {
u8 i, j = 0; u8 i, j = 0;
for (i = 0x50; i < 0xB8; i += sizeof(u32)) for (i = 0x50; i < 0xB8; i += sizeof(u32))
printf("%02x: 0x%08x %c", i, printf("%02x: 0x%08x %c", i,
smc911x_reg_read(CONFIG_DRIVER_SMC911X_BASE + i), smc911x_reg_read(dev, i),
(j++ % 2 ? '\n' : ' ')); (j++ % 2 ? '\n' : ' '));
} }
/** /**
* do_eeprom_cmd - handle eeprom communication * do_eeprom_cmd - handle eeprom communication
*/ */
static int do_eeprom_cmd(int cmd, u8 reg) static int do_eeprom_cmd(struct eth_device *dev, int cmd, u8 reg)
{ {
if (smc911x_reg_read(E2P_CMD) & E2P_CMD_EPC_BUSY) { if (smc911x_reg_read(dev, E2P_CMD) & E2P_CMD_EPC_BUSY) {
printf("eeprom_cmd: busy at start (E2P_CMD = 0x%08x)\n", printf("eeprom_cmd: busy at start (E2P_CMD = 0x%08x)\n",
smc911x_reg_read(E2P_CMD)); smc911x_reg_read(dev, E2P_CMD));
return -1; return -1;
} }
smc911x_reg_write(E2P_CMD, E2P_CMD_EPC_BUSY | cmd | reg); smc911x_reg_write(dev, E2P_CMD, E2P_CMD_EPC_BUSY | cmd | reg);
while (smc911x_reg_read(E2P_CMD) & E2P_CMD_EPC_BUSY) while (smc911x_reg_read(dev, E2P_CMD) & E2P_CMD_EPC_BUSY)
if (smsc_ctrlc()) { if (smsc_ctrlc()) {
printf("eeprom_cmd: timeout (E2P_CMD = 0x%08x)\n", printf("eeprom_cmd: timeout (E2P_CMD = 0x%08x)\n",
smc911x_reg_read(E2P_CMD)); smc911x_reg_read(dev, E2P_CMD));
return -1; return -1;
} }
@ -90,37 +94,37 @@ static int do_eeprom_cmd(int cmd, u8 reg)
/** /**
* read_eeprom_reg - read specified register in EEPROM * read_eeprom_reg - read specified register in EEPROM
*/ */
static u8 read_eeprom_reg(u8 reg) static u8 read_eeprom_reg(struct eth_device *dev, u8 reg)
{ {
int ret = do_eeprom_cmd(E2P_CMD_EPC_CMD_READ, reg); int ret = do_eeprom_cmd(dev, E2P_CMD_EPC_CMD_READ, reg);
return (ret ? : smc911x_reg_read(E2P_DATA)); return (ret ? : smc911x_reg_read(dev, E2P_DATA));
} }
/** /**
* write_eeprom_reg - write specified value into specified register in EEPROM * write_eeprom_reg - write specified value into specified register in EEPROM
*/ */
static int write_eeprom_reg(u8 value, u8 reg) static int write_eeprom_reg(struct eth_device *dev, u8 value, u8 reg)
{ {
int ret; int ret;
/* enable erasing/writing */ /* enable erasing/writing */
ret = do_eeprom_cmd(E2P_CMD_EPC_CMD_EWEN, reg); ret = do_eeprom_cmd(dev, E2P_CMD_EPC_CMD_EWEN, reg);
if (ret) if (ret)
goto done; goto done;
/* erase the eeprom reg */ /* erase the eeprom reg */
ret = do_eeprom_cmd(E2P_CMD_EPC_CMD_ERASE, reg); ret = do_eeprom_cmd(dev, E2P_CMD_EPC_CMD_ERASE, reg);
if (ret) if (ret)
goto done; goto done;
/* write the eeprom reg */ /* write the eeprom reg */
smc911x_reg_write(E2P_DATA, value); smc911x_reg_write(dev, E2P_DATA, value);
ret = do_eeprom_cmd(E2P_CMD_EPC_CMD_WRITE, reg); ret = do_eeprom_cmd(dev, E2P_CMD_EPC_CMD_WRITE, reg);
if (ret) if (ret)
goto done; goto done;
/* disable erasing/writing */ /* disable erasing/writing */
ret = do_eeprom_cmd(E2P_CMD_EPC_CMD_EWDS, reg); ret = do_eeprom_cmd(dev, E2P_CMD_EPC_CMD_EWDS, reg);
done: done:
return ret; return ret;
@ -139,7 +143,7 @@ static char *skip_space(char *buf)
/** /**
* write_stuff - handle writing of MAC registers / eeprom * write_stuff - handle writing of MAC registers / eeprom
*/ */
static void write_stuff(char *line) static void write_stuff(struct eth_device *dev, char *line)
{ {
char dest; char dest;
char *endp; char *endp;
@ -182,39 +186,39 @@ static void write_stuff(char *line)
/* Finally, execute the command */ /* Finally, execute the command */
if (dest == 'E') { if (dest == 'E') {
printf("Writing EEPROM register %02x with %02x\n", reg, value); printf("Writing EEPROM register %02x with %02x\n", reg, value);
write_eeprom_reg(value, reg); write_eeprom_reg(dev, value, reg);
} else { } else {
printf("Writing MAC register %02x with %08x\n", reg, value); printf("Writing MAC register %02x with %08x\n", reg, value);
smc911x_reg_write(CONFIG_DRIVER_SMC911X_BASE + reg, value); smc911x_reg_write(dev, reg, value);
} }
} }
/** /**
* copy_from_eeprom - copy MAC address in eeprom to address registers * copy_from_eeprom - copy MAC address in eeprom to address registers
*/ */
static void copy_from_eeprom(void) static void copy_from_eeprom(struct eth_device *dev)
{ {
ulong addrl = ulong addrl =
read_eeprom_reg(0x01) | read_eeprom_reg(dev, 0x01) |
read_eeprom_reg(0x02) << 8 | read_eeprom_reg(dev, 0x02) << 8 |
read_eeprom_reg(0x03) << 16 | read_eeprom_reg(dev, 0x03) << 16 |
read_eeprom_reg(0x04) << 24; read_eeprom_reg(dev, 0x04) << 24;
ulong addrh = ulong addrh =
read_eeprom_reg(0x05) | read_eeprom_reg(dev, 0x05) |
read_eeprom_reg(0x06) << 8; read_eeprom_reg(dev, 0x06) << 8;
smc911x_set_mac_csr(ADDRL, addrl); smc911x_set_mac_csr(dev, ADDRL, addrl);
smc911x_set_mac_csr(ADDRH, addrh); smc911x_set_mac_csr(dev, ADDRH, addrh);
puts("EEPROM contents copied to MAC\n"); puts("EEPROM contents copied to MAC\n");
} }
/** /**
* print_macaddr - print MAC address registers and MAC address in eeprom * print_macaddr - print MAC address registers and MAC address in eeprom
*/ */
static void print_macaddr(void) static void print_macaddr(struct eth_device *dev)
{ {
puts("Current MAC Address in MAC: "); puts("Current MAC Address in MAC: ");
ulong addrl = smc911x_get_mac_csr(ADDRL); ulong addrl = smc911x_get_mac_csr(dev, ADDRL);
ulong addrh = smc911x_get_mac_csr(ADDRH); ulong addrh = smc911x_get_mac_csr(dev, ADDRH);
printf("%02x:%02x:%02x:%02x:%02x:%02x\n", printf("%02x:%02x:%02x:%02x:%02x:%02x\n",
(u8)(addrl), (u8)(addrl >> 8), (u8)(addrl >> 16), (u8)(addrl), (u8)(addrl >> 8), (u8)(addrl >> 16),
(u8)(addrl >> 24), (u8)(addrh), (u8)(addrh >> 8)); (u8)(addrl >> 24), (u8)(addrh), (u8)(addrh >> 8));
@ -222,41 +226,42 @@ static void print_macaddr(void)
puts("Current MAC Address in EEPROM: "); puts("Current MAC Address in EEPROM: ");
int i; int i;
for (i = 1; i < 6; ++i) for (i = 1; i < 6; ++i)
printf("%02x:", read_eeprom_reg(i)); printf("%02x:", read_eeprom_reg(dev, i));
printf("%02x\n", read_eeprom_reg(i)); printf("%02x\n", read_eeprom_reg(dev, i));
} }
/** /**
* dump_eeprom - dump the whole content of the EEPROM * dump_eeprom - dump the whole content of the EEPROM
*/ */
static void dump_eeprom(void) static void dump_eeprom(struct eth_device *dev)
{ {
int i; int i;
puts("EEPROM:\n"); puts("EEPROM:\n");
for (i = 0; i < 7; ++i) for (i = 0; i < 7; ++i)
printf("%02x: 0x%02x\n", i, read_eeprom_reg(i)); printf("%02x: 0x%02x\n", i, read_eeprom_reg(dev, i));
} }
/** /**
* smc911x_init - get the MAC/EEPROM up and ready for use * smc911x_init - get the MAC/EEPROM up and ready for use
*/ */
static int smc911x_init(void) static int smc911x_init(struct eth_device *dev)
{ {
/* See if there is anything there */ /* See if there is anything there */
if (!smc911x_detect_chip()) if (!smc911x_detect_chip(dev))
return 1; return 1;
smc911x_reset(); smc911x_reset(dev);
/* Make sure we set EEDIO/EECLK to the EEPROM */ /* Make sure we set EEDIO/EECLK to the EEPROM */
if (smc911x_reg_read(GPIO_CFG) & GPIO_CFG_EEPR_EN) { if (smc911x_reg_read(dev, GPIO_CFG) & GPIO_CFG_EEPR_EN) {
while (smc911x_reg_read(E2P_CMD) & E2P_CMD_EPC_BUSY) while (smc911x_reg_read(dev, E2P_CMD) & E2P_CMD_EPC_BUSY)
if (smsc_ctrlc()) { if (smsc_ctrlc()) {
printf("init: timeout (E2P_CMD = 0x%08x)\n", printf("init: timeout (E2P_CMD = 0x%08x)\n",
smc911x_reg_read(E2P_CMD)); smc911x_reg_read(dev, E2P_CMD));
return 1; return 1;
} }
smc911x_reg_write(GPIO_CFG, smc911x_reg_read(GPIO_CFG) & ~GPIO_CFG_EEPR_EN); smc911x_reg_write(dev, GPIO_CFG,
smc911x_reg_read(dev, GPIO_CFG) & ~GPIO_CFG_EEPR_EN);
} }
return 0; return 0;
@ -317,6 +322,11 @@ static char *getline(void)
*/ */
int smc911x_eeprom(int argc, char *argv[]) int smc911x_eeprom(int argc, char *argv[])
{ {
/* Avoid initializing on stack as gcc likes to call memset() */
struct eth_device dev;
dev.name = __func__;
dev.iobase = CONFIG_SMC911X_BASE;
/* Print the ABI version */ /* Print the ABI version */
app_startup(argv); app_startup(argv);
if (XF_VERSION != get_version()) { if (XF_VERSION != get_version()) {
@ -328,7 +338,7 @@ int smc911x_eeprom(int argc, char *argv[])
/* Initialize the MAC/EEPROM somewhat */ /* Initialize the MAC/EEPROM somewhat */
puts("\n"); puts("\n");
if (smc911x_init()) if (smc911x_init(&dev))
return 1; return 1;
/* Dump helpful usage information */ /* Dump helpful usage information */
@ -360,11 +370,11 @@ int smc911x_eeprom(int argc, char *argv[])
/* Now parse the command */ /* Now parse the command */
switch (line[0]) { switch (line[0]) {
case 'W': write_stuff(line); break; case 'W': write_stuff(&dev, line); break;
case 'D': dump_eeprom(); break; case 'D': dump_eeprom(&dev); break;
case 'M': dump_regs(); break; case 'M': dump_regs(&dev); break;
case 'C': copy_from_eeprom(); break; case 'C': copy_from_eeprom(&dev); break;
case 'P': print_macaddr(); break; case 'P': print_macaddr(&dev); break;
unknown_cmd: unknown_cmd:
default: puts("ERROR: Unknown command!\n\n"); default: puts("ERROR: Unknown command!\n\n");
case '?': case '?':
@ -373,11 +383,3 @@ int smc911x_eeprom(int argc, char *argv[])
} }
} }
} }
#else
int smc911x_eeprom(int argc, char *argv[])
{
puts("Not supported for this board\n");
return 1;
}
#endif