[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140305154532.331faba8@nehalam.linuxnetplumber.net>
Date: Wed, 5 Mar 2014 15:45:32 -0800
From: Stephen Hemminger <stephen@...workplumber.org>
To: Tim Harvey <tharvey@...eworks.com>
Cc: netdev@...r.kernel.org, devicetree@...r.kernel.org,
Grant Likely <grant.likely@...aro.org>,
Rob Herring <robh+dt@...nel.org>
Subject: Re: [PATCH v2] sky2: allow mac to come from dt
On Wed, 5 Mar 2014 14:45:12 -0800
Tim Harvey <tharvey@...eworks.com> wrote:
> + 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);
Can be done without stack tmpaddr.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists