* [PATCH] net: allow sh_eth to get mac address through platform data
@ 2009-10-09 10:17 Magnus Damm
2009-10-13 10:46 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Magnus Damm @ 2009-10-09 10:17 UTC (permalink / raw)
To: netdev; +Cc: Magnus Damm, lethal, davem, linux-sh
From: Magnus Damm <damm@opensource.se>
Extend the sh_eth driver to allow passing the mac address
using the platform data structure. This to simplify board
setup code.
Signed-off-by: Magnus Damm <damm@opensource.se>
Tested-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
---
arch/sh/include/asm/sh_eth.h | 1 +
drivers/net/sh_eth.c | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
--- 0001/arch/sh/include/asm/sh_eth.h
+++ work/arch/sh/include/asm/sh_eth.h 2009-10-07 15:04:57.000000000 +0900
@@ -7,6 +7,7 @@ struct sh_eth_plat_data {
int phy;
int edmac_endian;
+ unsigned char mac_addr[6];
unsigned no_ether_link:1;
unsigned ether_link_active_low:1;
};
--- 0001/drivers/net/sh_eth.c
+++ work/drivers/net/sh_eth.c 2009-10-07 16:54:29.000000000 +0900
@@ -298,16 +298,20 @@ static void update_mac_address(struct ne
* When you want use this device, you must set MAC address in bootloader.
*
*/
-static void read_mac_address(struct net_device *ndev)
+static void read_mac_address(struct net_device *ndev, unsigned char *mac)
{
u32 ioaddr = ndev->base_addr;
- ndev->dev_addr[0] = (ctrl_inl(ioaddr + MAHR) >> 24);
- ndev->dev_addr[1] = (ctrl_inl(ioaddr + MAHR) >> 16) & 0xFF;
- ndev->dev_addr[2] = (ctrl_inl(ioaddr + MAHR) >> 8) & 0xFF;
- ndev->dev_addr[3] = (ctrl_inl(ioaddr + MAHR) & 0xFF);
- ndev->dev_addr[4] = (ctrl_inl(ioaddr + MALR) >> 8) & 0xFF;
- ndev->dev_addr[5] = (ctrl_inl(ioaddr + MALR) & 0xFF);
+ if (mac[0] || mac[1] || mac[2] || mac[3] || mac[4] || mac[5]) {
+ memcpy(ndev->dev_addr, mac, 6);
+ } else {
+ ndev->dev_addr[0] = (ctrl_inl(ioaddr + MAHR) >> 24);
+ ndev->dev_addr[1] = (ctrl_inl(ioaddr + MAHR) >> 16) & 0xFF;
+ ndev->dev_addr[2] = (ctrl_inl(ioaddr + MAHR) >> 8) & 0xFF;
+ ndev->dev_addr[3] = (ctrl_inl(ioaddr + MAHR) & 0xFF);
+ ndev->dev_addr[4] = (ctrl_inl(ioaddr + MALR) >> 8) & 0xFF;
+ ndev->dev_addr[5] = (ctrl_inl(ioaddr + MALR) & 0xFF);
+ }
}
struct bb_info {
@@ -1427,7 +1431,7 @@ static int sh_eth_drv_probe(struct platf
mdp->post_fw = POST_FW >> (devno << 1);
/* read and set MAC address */
- read_mac_address(ndev);
+ read_mac_address(ndev, pd->mac_addr);
/* First device only init */
if (!devno) {
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] net: allow sh_eth to get mac address through platform data
2009-10-09 10:17 [PATCH] net: allow sh_eth to get mac address through platform data Magnus Damm
@ 2009-10-13 10:46 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-10-13 10:46 UTC (permalink / raw)
To: magnus.damm; +Cc: netdev, lethal, linux-sh
From: Magnus Damm <magnus.damm@gmail.com>
Date: Fri, 09 Oct 2009 19:17:14 +0900
> From: Magnus Damm <damm@opensource.se>
>
> Extend the sh_eth driver to allow passing the mac address
> using the platform data structure. This to simplify board
> setup code.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> Tested-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-13 10:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-09 10:17 [PATCH] net: allow sh_eth to get mac address through platform data Magnus Damm
2009-10-13 10:46 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).