From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tim Harvey Subject: [PATCH v2] sky2: allow mac to come from dt Date: Wed, 5 Mar 2014 14:45:12 -0800 Message-ID: <1394059512-1691-1-git-send-email-tharvey@gateworks.com> Return-path: Sender: netdev-owner@vger.kernel.org To: Stephen Hemminger Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, Grant Likely , Rob Herring List-Id: devicetree@vger.kernel.org The driver reads the mac address from the device registers which would need to have been programmed by the bootloader. This patch adds the ability to pull the mac from devicetree via the pci device dt node. Signed-off-by: Tim Harvey Cc: netdev@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: Grant Likely Cc: Rob Herring Changes since v1: - simplified based on feedback - fixed formatting --- drivers/net/ethernet/marvell/sky2.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 55a37ae..471473e 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -44,6 +44,8 @@ #include #include #include +#include +#include #include @@ -4748,6 +4750,7 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, { struct sky2_port *sky2; struct net_device *dev = alloc_etherdev(sizeof(*sky2)); + unsigned char *iap, tmpaddr[ETH_ALEN]; if (!dev) return NULL; @@ -4805,8 +4808,17 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, dev->features |= dev->hw_features; - /* read the mac address */ - memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); + /* try to get mac address in the following order: + * 1) from device tree data + * 2) from internal registers set by bootloader + */ + iap = of_get_mac_address(hw->pdev->dev.of_node); + if (!iap) { + memcpy_fromio(&tmpaddr, hw->regs + B2_MAC_1 + port * 8, + ETH_ALEN); + iap = tmpaddr; + } + ether_addr_copy(dev->dev_addr, iap); return dev; } -- 1.8.3.2