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

Commit 908578e7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sh_eth-sw-reset' 



Sergei Shtylyov says:

====================
sh_eth: couple of software reset bit cleanups

   Here's a set of 2 patches against DaveM's 'net-next.git' repo. We can save
on the repetitive chip reset code...

[1/2] sh_eth: call sh_eth_tsu_write() from sh_eth_chip_reset_giga()
[2/2] sh_eth: reuse sh_eth_chip_reset()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 59efcbaf c66b2581

drivers/net/ethernet/renesas/sh_eth.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -537,11 +537,7 @@ static struct sh_eth_cpu_data r7s72100_data = { 




static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)

static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)

{

{

	struct sh_eth_private *mdp = netdev_priv(ndev);

	sh_eth_chip_reset(ndev);



	/* reset device */

	sh_eth_tsu_write(mdp, ARSTR_ARST, ARSTR);

	mdelay(1);





	sh_eth_select_mii(ndev);

	sh_eth_select_mii(ndev);

}

}
@@ -725,8 +721,8 @@ static struct sh_eth_cpu_data sh7757_data = { 
#define GIGA_MAHR(port)		(SH_GIGA_ETH_BASE + 0x800 * (port) + 0x05c0)

#define GIGA_MAHR(port)		(SH_GIGA_ETH_BASE + 0x800 * (port) + 0x05c0)

static void sh_eth_chip_reset_giga(struct net_device *ndev)

static void sh_eth_chip_reset_giga(struct net_device *ndev)

{

{

	int i;

	u32 mahr[2], malr[2];

	u32 mahr[2], malr[2];

	int i;





	/* save MAHR and MALR */

	/* save MAHR and MALR */

	for (i = 0; i < 2; i++) {

	for (i = 0; i < 2; i++) {
@@ -734,9 +730,7 @@ static void sh_eth_chip_reset_giga(struct net_device *ndev) 
		mahr[i] = ioread32((void *)GIGA_MAHR(i));

		mahr[i] = ioread32((void *)GIGA_MAHR(i));

	}

	}





	/* reset device */

	sh_eth_chip_reset(ndev);

	iowrite32(ARSTR_ARST, (void *)(SH_GIGA_ETH_BASE + 0x1800));

	mdelay(1);





	/* restore MAHR and MALR */

	/* restore MAHR and MALR */

	for (i = 0; i < 2; i++) {

	for (i = 0; i < 2; i++) {