diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2016-05-14 14:55:50 +0900 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-16 13:55:49 -0400 |
commit | c3875ca7d9f9ad135debc78e211ea062ac48323c (patch) | |
tree | 8175848962e7b2aa6887a6f1a89a9acc7a1460f4 /drivers/net/ethernet/wiznet/w5100.c | |
parent | 7d6da453efce17fae35707fa7e5757e7ade8b3cc (diff) | |
download | linux-stable-c3875ca7d9f9ad135debc78e211ea062ac48323c.tar.gz linux-stable-c3875ca7d9f9ad135debc78e211ea062ac48323c.tar.bz2 linux-stable-c3875ca7d9f9ad135debc78e211ea062ac48323c.zip |
net: w5100-spi: add support to specify MAC address by device tree
This adds support to specify the MAC address by 'mac-address' or
'local-mac-address' properties in the device tree. These are common
properties for the Ethernet controller.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mike Sinkovsky <msink@permonline.ru>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/wiznet/w5100.c')
-rw-r--r-- | drivers/net/ethernet/wiznet/w5100.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 21bef2ca2ac0..4f6255cf62ce 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -1052,7 +1052,7 @@ static const struct net_device_ops w5100_netdev_ops = { static int w5100_mmio_probe(struct platform_device *pdev) { struct wiznet_platform_data *data = dev_get_platdata(&pdev->dev); - u8 *mac_addr = NULL; + const void *mac_addr = NULL; struct resource *mem; const struct w5100_ops *ops; int irq; @@ -1087,7 +1087,8 @@ void *w5100_ops_priv(const struct net_device *ndev) EXPORT_SYMBOL_GPL(w5100_ops_priv); int w5100_probe(struct device *dev, const struct w5100_ops *ops, - int sizeof_ops_priv, u8 *mac_addr, int irq, int link_gpio) + int sizeof_ops_priv, const void *mac_addr, int irq, + int link_gpio) { struct w5100_priv *priv; struct net_device *ndev; |