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

Commit 50d5d2bd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sh_eth-next' 



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 clean up
the use of the software reset bits...
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3ccec4bd ec65cfce

drivers/net/ethernet/renesas/sh_eth.c

+4 −4
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static void sh_eth_chip_reset(struct net_device *ndev) 
	struct sh_eth_private *mdp = netdev_priv(ndev);



	/* reset device */

	sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);

	sh_eth_tsu_write(mdp, ARSTR_ARST, ARSTR);

	mdelay(1);

}
@@ -540,7 +540,7 @@ static void sh_eth_chip_reset_r8a7740(struct net_device *ndev) 
	struct sh_eth_private *mdp = netdev_priv(ndev);



	/* reset device */

	sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);

	sh_eth_tsu_write(mdp, ARSTR_ARST, ARSTR);

	mdelay(1);



	sh_eth_select_mii(ndev);
@@ -735,7 +735,7 @@ static void sh_eth_chip_reset_giga(struct net_device *ndev) 
	}



	/* reset device */

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

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

	mdelay(1);



	/* restore MAHR and MALR */
@@ -899,7 +899,7 @@ static int sh_eth_check_reset(struct net_device *ndev) 
	int cnt = 100;



	while (cnt > 0) {

		if (!(sh_eth_read(ndev, EDMR) & 0x3))

		if (!(sh_eth_read(ndev, EDMR) & EDMR_SRST_GETHER))

			break;

		mdelay(1);

		cnt--;

drivers/net/ethernet/renesas/sh_eth.h

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ enum RPADIR_BIT { 
#define DEFAULT_FDR_INIT	0x00000707



/* ARSTR */

enum ARSTR_BIT { ARSTR_ARSTR = 0x00000001, };

enum ARSTR_BIT { ARSTR_ARST = 0x00000001, };



/* TSU_FWEN0 */

enum TSU_FWEN0_BIT {