From: Stephen Hemminger <stephen@networkplumber.org>
To: Tim Harvey <tharvey@gateworks.com>
Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org,
Grant Likely <grant.likely@linaro.org>,
Rob Herring <robh+dt@kernel.org>
Subject: Re: [PATCH v2] sky2: allow mac to come from dt
Date: Wed, 5 Mar 2014 15:45:32 -0800 [thread overview]
Message-ID: <20140305154532.331faba8@nehalam.linuxnetplumber.net> (raw)
In-Reply-To: <1394059512-1691-1-git-send-email-tharvey@gateworks.com>
On Wed, 5 Mar 2014 14:45:12 -0800
Tim Harvey <tharvey@gateworks.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.
next prev parent reply other threads:[~2014-03-05 23:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-05 22:45 [PATCH v2] sky2: allow mac to come from dt Tim Harvey
2014-03-05 23:45 ` Stephen Hemminger [this message]
2014-03-07 19:36 ` David Miller
2014-03-07 20:08 ` Tim Harvey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140305154532.331faba8@nehalam.linuxnetplumber.net \
--to=stephen@networkplumber.org \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=tharvey@gateworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.