[PATCH 06/20] can: flexcan: Ack wakeup interrupt separately

[Marc Kleine-Budde]

From: Joakim Zhang <qiangqing.zh...@nxp.com>

As FLEXCAN_ESR_ALL_INT is for all bus errors and state change IRQ
sources, strictly speaking FLEXCAN_ESR_WAK_INT does not belong to these.
So add wakeup interrupt ack separately to existing ack of the
interrupts.

Suggested-by: Marc Kleine-Budde <m...@pengutronix.de>
Signed-off-by: Joakim Zhang <qiangqing.zh...@nxp.com>
Link: https://lore.kernel.org/r/20191204113249.3381-3-qiangqing.zh...@nxp.com
Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
---
 drivers/net/can/flexcan.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index b180dd1ba763..06cddc468739 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -134,8 +134,7 @@
        (FLEXCAN_ESR_ERR_BUS | FLEXCAN_ESR_ERR_STATE)
 #define FLEXCAN_ESR_ALL_INT \
        (FLEXCAN_ESR_TWRN_INT | FLEXCAN_ESR_RWRN_INT | \
-        FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT | \
-        FLEXCAN_ESR_WAK_INT)
+        FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT)
 
 /* FLEXCAN interrupt flag register (IFLAG) bits */
 /* Errata ERR005829 step7: Reserve first valid MB */
@@ -979,10 +978,10 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
 
        reg_esr = priv->read(&regs->esr);
 
-       /* ACK all bus error and state change IRQ sources */
-       if (reg_esr & FLEXCAN_ESR_ALL_INT) {
+       /* ACK all bus error, state change and wake IRQ sources */
+       if (reg_esr & (FLEXCAN_ESR_ALL_INT | FLEXCAN_ESR_WAK_INT)) {
                handled = IRQ_HANDLED;
-               priv->write(reg_esr & FLEXCAN_ESR_ALL_INT, &regs->esr);
+               priv->write(reg_esr & (FLEXCAN_ESR_ALL_INT | 
FLEXCAN_ESR_WAK_INT), &regs->esr);
        }
 
        /* state change interrupt or broken error state quirk fix is enabled */
-- 
2.28.0