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

Commit 507eebef authored by chaithrika@ti.com's avatar chaithrika@ti.com Committed by David S. Miller
Browse files

TI DaVinci EMAC: Minor macro related updates 



Use BIT for macro definitions wherever possible, remove
unused and redundant macros.

Signed-off-by: default avatarChaithrika U S <chaithrika@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a91ca4e

drivers/net/davinci_emac.c

+11 −15
Original line number Diff line number Diff line
@@ -164,16 +164,14 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1"; 
# define EMAC_MBP_MCASTCHAN(ch)		((ch) & 0x7)



/* EMAC mac_control register */

#define EMAC_MACCONTROL_TXPTYPE		(0x200)

#define EMAC_MACCONTROL_TXPACEEN	(0x40)

#define EMAC_MACCONTROL_MIIEN		(0x20)

#define EMAC_MACCONTROL_GIGABITEN	(0x80)

#define EMAC_MACCONTROL_GIGABITEN_SHIFT (7)

#define EMAC_MACCONTROL_FULLDUPLEXEN	(0x1)

#define EMAC_MACCONTROL_TXPTYPE		BIT(9)

#define EMAC_MACCONTROL_TXPACEEN	BIT(6)

#define EMAC_MACCONTROL_GMIIEN		BIT(5)

#define EMAC_MACCONTROL_GIGABITEN	BIT(7)

#define EMAC_MACCONTROL_FULLDUPLEXEN	BIT(0)

#define EMAC_MACCONTROL_RMIISPEED_MASK	BIT(15)



/* GIGABIT MODE related bits */

#define EMAC_DM646X_MACCONTORL_GMIIEN	BIT(5)

#define EMAC_DM646X_MACCONTORL_GIG	BIT(7)

#define EMAC_DM646X_MACCONTORL_GIGFORCE	BIT(17)
@@ -192,10 +190,10 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1"; 
#define EMAC_RX_BUFFER_OFFSET_MASK	(0xFFFF)



/* MAC_IN_VECTOR (0x180) register bit fields */

#define EMAC_DM644X_MAC_IN_VECTOR_HOST_INT	      (0x20000)

#define EMAC_DM644X_MAC_IN_VECTOR_STATPEND_INT	      (0x10000)

#define EMAC_DM644X_MAC_IN_VECTOR_RX_INT_VEC	      (0x0100)

#define EMAC_DM644X_MAC_IN_VECTOR_TX_INT_VEC	      (0x01)

#define EMAC_DM644X_MAC_IN_VECTOR_HOST_INT	BIT(17)

#define EMAC_DM644X_MAC_IN_VECTOR_STATPEND_INT	BIT(16)

#define EMAC_DM644X_MAC_IN_VECTOR_RX_INT_VEC	BIT(8)

#define EMAC_DM644X_MAC_IN_VECTOR_TX_INT_VEC	BIT(0)



/** NOTE:: For DM646x the IN_VECTOR has changed */

#define EMAC_DM646X_MAC_IN_VECTOR_RX_INT_VEC	BIT(EMAC_DEF_RX_CH)
@@ -203,7 +201,6 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1"; 
#define EMAC_DM646X_MAC_IN_VECTOR_HOST_INT	BIT(26)

#define EMAC_DM646X_MAC_IN_VECTOR_STATPEND_INT	BIT(27)





/* CPPI bit positions */

#define EMAC_CPPI_SOP_BIT		BIT(31)

#define EMAC_CPPI_EOP_BIT		BIT(30)
@@ -750,8 +747,7 @@ static void emac_update_phystatus(struct emac_priv *priv) 


	if (priv->speed == SPEED_1000 && (priv->version == EMAC_VERSION_2)) {

		mac_control = emac_read(EMAC_MACCONTROL);

		mac_control |= (EMAC_DM646X_MACCONTORL_GMIIEN |

				EMAC_DM646X_MACCONTORL_GIG |

		mac_control |= (EMAC_DM646X_MACCONTORL_GIG |

				EMAC_DM646X_MACCONTORL_GIGFORCE);

	} else {

		/* Clear the GIG bit and GIGFORCE bit */
@@ -2108,7 +2104,7 @@ static int emac_hw_enable(struct emac_priv *priv) 


	/* Enable MII */

	val = emac_read(EMAC_MACCONTROL);

	val |= (EMAC_MACCONTROL_MIIEN);

	val |= (EMAC_MACCONTROL_GMIIEN);

	emac_write(EMAC_MACCONTROL, val);



	/* Enable NAPI and interrupts */