Skip to content

Commit e879b7a

Browse files
Niklas Casseldavem330
authored andcommitted
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: Niklas Cassel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1b84ca1 commit e879b7a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
#define GMAC_PCS_IRQ_DEFAULT (GMAC_INT_RGSMIIS | GMAC_INT_PCS_LINK | \
9999
GMAC_INT_PCS_ANE)
100100

101-
#define GMAC_INT_DEFAULT_MASK (GMAC_INT_PMT_EN | GMAC_INT_LPI_EN)
101+
#define GMAC_INT_DEFAULT_ENABLE (GMAC_INT_PMT_EN | GMAC_INT_LPI_EN)
102102

103103
enum dwmac4_irq_status {
104104
time_stamp_irq = 0x00001000,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ static void dwmac4_core_init(struct mac_device_info *hw,
6161

6262
writel(value, ioaddr + GMAC_CONFIG);
6363

64-
/* Mask GMAC interrupts */
65-
value = GMAC_INT_DEFAULT_MASK;
64+
/* Enable GMAC interrupts */
65+
value = GMAC_INT_DEFAULT_ENABLE;
6666
if (hw->pmt)
6767
value |= GMAC_INT_PMT_EN;
6868
if (hw->pcs)

0 commit comments

Comments
 (0)