sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

net usb asix: read MAC from EEPROM on AX88772B 

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Philipp Zabel 2014-01-28 22:46:46 +01:00 committed by Sascha Hauer
parent f5fa816cff
commit 4eabf125fb
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/usb/asix.c
View File

@ -132,6 +132,8 @@
#define MARVELL_CTRL_TXDELAY 0x0002
#define MARVELL_CTRL_RXDELAY 0x0080
#define FLAG_EEPROM_MAC (1UL << 0) /* init device MAC from eeprom */
/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
struct asix_data {
u8 multi_filter[AX_MCAST_FILTER_SIZE];
@ -364,11 +366,21 @@ static int asix_write_gpio(struct usbnet *dev, u16 value, int sleep)
static int asix_get_ethaddr(struct eth_device *edev, unsigned char *adr)
{
struct usbnet *udev = container_of(edev, struct usbnet, edev);
int ret;
int i, ret;
/* Get the MAC address */
if ((ret = asix_read_cmd(udev, AX_CMD_READ_NODE_ID,
0, 0, 6, adr)) < 0) {
if (udev->driver_info->data & FLAG_EEPROM_MAC) {
for (i = 0; i < (6 >> 1); i++) {
ret = asix_read_cmd(udev, AX_CMD_READ_EEPROM, 0x04 + i,
0, 2, adr + i * 2);
if (ret < 0)
break;
}
} else {
ret = asix_read_cmd(udev, AX_CMD_READ_NODE_ID, 0, 0, 6, adr);
}
if (ret < 0) {
debug("Failed to read MAC address: %d\n", ret);
return -1;
}