Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03fc5d4f authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by David S. Miller
Browse files

net: usb: asix: allow optionally getting mac address from device tree 



For Embedded use where e.g. AX88772B chips may be used without external
EEPROMs the boot loader may choose to pass the MAC address to be used
via device tree. Therefore, allow for optionally getting the MAC
address from device tree data e.g. as follows (excerpt from a T30 based
board, local-mac-address to be filled in by boot loader):

/* EHCI instance 1: USB2_DP/N -> AX88772B */
usb@7d004000 {
	status = "okay";
	#address-cells = <1>;
	#size-cells = <0>;
	asix@1 {
		reg = <1>;
		local-mac-address = [00 00 00 00 00 00];
	};
};

Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30e99ed6

drivers/net/usb/asix_devices.c

+23 −15
Original line number Diff line number Diff line
@@ -693,11 +693,17 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) 


	usbnet_get_endpoints(dev, intf);



	/* Get the MAC address */

	/* Maybe the boot loader passed the MAC address via device tree */

	if (!eth_platform_get_mac_address(&dev->udev->dev, buf)) {

		netif_dbg(dev, ifup, dev->net,

			  "MAC address read from device tree");

	} else {

		/* Try getting the MAC address from EEPROM */

		if (dev->driver_info->data & FLAG_EEPROM_MAC) {

			for (i = 0; i < (ETH_ALEN >> 1); i++) {

			ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x04 + i,

					    0, 2, buf + i * 2, 0);

				ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM,

						    0x04 + i, 0, 2, buf + i * 2,

						    0);

				if (ret < 0)

					break;

			}
@@ -707,9 +713,11 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) 
		}



		if (ret < 0) {

		netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);

			netdev_dbg(dev->net, "Failed to read MAC address: %d\n",

				   ret);

			return ret;

		}

	}



	asix_set_netdev_dev_addr(dev, buf);