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

Commit 140b7552 authored by Patrice Vilchez's avatar Patrice Vilchez Committed by David S. Miller
Browse files

net/macb: Add support for Gigabit Ethernet mode 



Add Gigabit Ethernet mode to GEM cadence IP and enable RGMII connection.

Signed-off-by: default avatarPatrice Vilchez <patrice.vilchez@atmel.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: default avatarJoachim Eastwood <manabian@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65f8f9a1

drivers/net/ethernet/cadence/macb.c

+12 −3
Original line number Diff line number Diff line
@@ -152,13 +152,17 @@ static void macb_handle_link_change(struct net_device *dev) 


			reg = macb_readl(bp, NCFGR);

			reg &= ~(MACB_BIT(SPD) | MACB_BIT(FD));

			if (macb_is_gem(bp))

				reg &= ~GEM_BIT(GBE);



			if (phydev->duplex)

				reg |= MACB_BIT(FD);

			if (phydev->speed == SPEED_100)

				reg |= MACB_BIT(SPD);

			if (phydev->speed == SPEED_1000)

				reg |= GEM_BIT(GBE);



			macb_writel(bp, NCFGR, reg);

			macb_or_gem_writel(bp, NCFGR, reg);



			bp->speed = phydev->speed;

			bp->duplex = phydev->duplex;
@@ -216,6 +220,9 @@ static int macb_mii_probe(struct net_device *dev) 
	}



	/* mask with MAC supported features */

	if (macb_is_gem(bp))

		phydev->supported &= PHY_GBIT_FEATURES;

	else

		phydev->supported &= PHY_BASIC_FEATURES;



	phydev->advertising = phydev->supported;
@@ -1388,7 +1395,9 @@ static int __init macb_probe(struct platform_device *pdev) 
		bp->phy_interface = err;

	}



	if (bp->phy_interface == PHY_INTERFACE_MODE_RMII)

	if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII)

		macb_or_gem_writel(bp, USRIO, GEM_BIT(RGMII));

	else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII)

#if defined(CONFIG_ARCH_AT91)

		macb_or_gem_writel(bp, USRIO, (MACB_BIT(RMII) |

					       MACB_BIT(CLKEN)));

drivers/net/ethernet/cadence/macb.h

+4 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ 
#define MACB_IRXFCS_SIZE			1



/* GEM specific NCFGR bitfields. */

#define GEM_GBE_OFFSET				10

#define GEM_GBE_SIZE				1

#define GEM_CLK_OFFSET				18

#define GEM_CLK_SIZE				3

#define GEM_DBW_OFFSET				21
@@ -252,6 +254,8 @@ 
/* Bitfields in USRIO (AT91) */

#define MACB_RMII_OFFSET			0

#define MACB_RMII_SIZE				1

#define GEM_RGMII_OFFSET			0	/* GEM gigabit mode */

#define GEM_RGMII_SIZE				1

#define MACB_CLKEN_OFFSET			1

#define MACB_CLKEN_SIZE				1