Commit 45487403 authored by Stefan Roese's avatar Stefan Roese Committed by David S. Miller

net: ethernet: mediatek: Rename MTK_QMTK_INT_STATUS to MTK_QDMA_INT_STATUS

Currently all QDMA registers are named "MTK_QDMA_foo" in this driver
with one exception: MTK_QMTK_INT_STATUS. This patch renames
MTK_QMTK_INT_STATUS to MTK_QDMA_INT_STATUS so that all macros follow
this rule.
Signed-off-by: default avatarStefan Roese <sr@denx.de>
Cc: René van Dorst <opensource@vdorst.com>
Cc: Daniel Golle <daniel@makrotopia.org>
Cc: Sean Wang <sean.wang@mediatek.com>
Cc: John Crispin <john@phrozen.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5be4480d
...@@ -1122,11 +1122,11 @@ static int mtk_napi_tx(struct napi_struct *napi, int budget) ...@@ -1122,11 +1122,11 @@ static int mtk_napi_tx(struct napi_struct *napi, int budget)
int tx_done = 0; int tx_done = 0;
mtk_handle_status_irq(eth); mtk_handle_status_irq(eth);
mtk_w32(eth, MTK_TX_DONE_INT, MTK_QMTK_INT_STATUS); mtk_w32(eth, MTK_TX_DONE_INT, MTK_QDMA_INT_STATUS);
tx_done = mtk_poll_tx(eth, budget); tx_done = mtk_poll_tx(eth, budget);
if (unlikely(netif_msg_intr(eth))) { if (unlikely(netif_msg_intr(eth))) {
status = mtk_r32(eth, MTK_QMTK_INT_STATUS); status = mtk_r32(eth, MTK_QDMA_INT_STATUS);
mask = mtk_r32(eth, MTK_QDMA_INT_MASK); mask = mtk_r32(eth, MTK_QDMA_INT_MASK);
dev_info(eth->dev, dev_info(eth->dev,
"done tx %d, intr 0x%08x/0x%x\n", "done tx %d, intr 0x%08x/0x%x\n",
...@@ -1136,7 +1136,7 @@ static int mtk_napi_tx(struct napi_struct *napi, int budget) ...@@ -1136,7 +1136,7 @@ static int mtk_napi_tx(struct napi_struct *napi, int budget)
if (tx_done == budget) if (tx_done == budget)
return budget; return budget;
status = mtk_r32(eth, MTK_QMTK_INT_STATUS); status = mtk_r32(eth, MTK_QDMA_INT_STATUS);
if (status & MTK_TX_DONE_INT) if (status & MTK_TX_DONE_INT)
return budget; return budget;
...@@ -1747,7 +1747,7 @@ static irqreturn_t mtk_handle_irq(int irq, void *_eth) ...@@ -1747,7 +1747,7 @@ static irqreturn_t mtk_handle_irq(int irq, void *_eth)
mtk_handle_irq_rx(irq, _eth); mtk_handle_irq_rx(irq, _eth);
} }
if (mtk_r32(eth, MTK_QDMA_INT_MASK) & MTK_TX_DONE_INT) { if (mtk_r32(eth, MTK_QDMA_INT_MASK) & MTK_TX_DONE_INT) {
if (mtk_r32(eth, MTK_QMTK_INT_STATUS) & MTK_TX_DONE_INT) if (mtk_r32(eth, MTK_QDMA_INT_STATUS) & MTK_TX_DONE_INT)
mtk_handle_irq_tx(irq, _eth); mtk_handle_irq_tx(irq, _eth);
} }
......
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
#define FC_THRES_MIN 0x4444 #define FC_THRES_MIN 0x4444
/* QDMA Interrupt Status Register */ /* QDMA Interrupt Status Register */
#define MTK_QMTK_INT_STATUS 0x1A18 #define MTK_QDMA_INT_STATUS 0x1A18
#define MTK_RX_DONE_DLY BIT(30) #define MTK_RX_DONE_DLY BIT(30)
#define MTK_RX_DONE_INT3 BIT(19) #define MTK_RX_DONE_INT3 BIT(19)
#define MTK_RX_DONE_INT2 BIT(18) #define MTK_RX_DONE_INT2 BIT(18)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment