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

Commit e879b7ab authored by Niklas Cassel's avatar Niklas Cassel Committed by David S. Miller
Browse files

net: stmmac: rename GMAC_INT_DEFAULT_MASK for dwmac4 



GMAC_INT_DEFAULT_MASK is written to the interrupt enable register.
In previous versions of the IP (e.g. dwmac1000), this register was
instead an interrupt mask register.
To improve clarity and reflect reality, rename GMAC_INT_DEFAULT_MASK
to GMAC_INT_DEFAULT_ENABLE.

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b84ca18

drivers/net/ethernet/stmicro/stmmac/dwmac4.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
#define	GMAC_PCS_IRQ_DEFAULT	(GMAC_INT_RGSMIIS | GMAC_INT_PCS_LINK |	\

				 GMAC_INT_PCS_ANE)



#define	GMAC_INT_DEFAULT_MASK	(GMAC_INT_PMT_EN | GMAC_INT_LPI_EN)

#define	GMAC_INT_DEFAULT_ENABLE	(GMAC_INT_PMT_EN | GMAC_INT_LPI_EN)



enum dwmac4_irq_status {

	time_stamp_irq = 0x00001000,

drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ static void dwmac4_core_init(struct mac_device_info *hw, 


	writel(value, ioaddr + GMAC_CONFIG);



	/* Mask GMAC interrupts */

	value = GMAC_INT_DEFAULT_MASK;

	/* Enable GMAC interrupts */

	value = GMAC_INT_DEFAULT_ENABLE;

	if (hw->pmt)

		value |= GMAC_INT_PMT_EN;

	if (hw->pcs)