Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 748031f9 authored by Magnus Damm's avatar Magnus Damm Committed by David S. Miller
Browse files

net: allow sh_eth to get mac address through platform data 



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: default avatarMagnus Damm <damm@opensource.se>
Tested-by: default avatarKuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6e4bc53

arch/sh/include/asm/sh_eth.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

};

drivers/net/sh_eth.c

+12 −8
Original line number Diff line number Diff line
@@ -298,10 +298,13 @@ static void update_mac_address(struct net_device *ndev) 
 * 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;



	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;
@@ -309,6 +312,7 @@ static void read_mac_address(struct net_device *ndev) 
		ndev->dev_addr[4] = (ctrl_inl(ioaddr + MALR) >> 8) & 0xFF;

		ndev->dev_addr[5] = (ctrl_inl(ioaddr + MALR) & 0xFF);

	}

}



struct bb_info {

	struct mdiobb_ctrl ctrl;
@@ -1427,7 +1431,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 
	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) {