From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Kleine-Budde Subject: [PATCH v2 08/11] can: flexcan: reg_imask2_default Date: Thu, 10 Dec 2015 13:33:54 +0100 Message-ID: <1449750837-11376-9-git-send-email-mkl@pengutronix.de> References: <1449750837-11376-1-git-send-email-mkl@pengutronix.de> Return-path: Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:43105 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753432AbbLJMdp (ORCPT ); Thu, 10 Dec 2015 07:33:45 -0500 In-Reply-To: <1449750837-11376-1-git-send-email-mkl@pengutronix.de> Sender: linux-can-owner@vger.kernel.org List-ID: To: linux-can@vger.kernel.org Cc: kernel@pengutronix.de, bhupesh.sharma@freescale.com, Marc Kleine-Budde Signed-off-by: Marc Kleine-Budde --- drivers/net/can/flexcan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index b1135012ced3..1b3a784607c9 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -265,6 +265,7 @@ struct flexcan_priv { u32 poll_esr; /* used in flexcan_poll_bus_err */ u32 reg_ctrl_default; u32 reg_imask1_default; + u32 reg_imask2_default; struct clk *clk_ipg; struct clk *clk_per; @@ -933,6 +934,7 @@ static int flexcan_chip_start(struct net_device *dev) disable_irq(dev->irq); flexcan_write(priv->reg_ctrl_default, ®s->ctrl); flexcan_write(priv->reg_imask1_default, ®s->imask1); + flexcan_write(priv->reg_imask2_default, ®s->imask2); enable_irq(dev->irq); /* print chip status */ @@ -962,6 +964,7 @@ static void flexcan_chip_stop(struct net_device *dev) flexcan_chip_disable(priv); /* Disable all interrupts */ + flexcan_write(0, ®s->imask2); flexcan_write(0, ®s->imask1); flexcan_write(priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_ALL, ®s->ctrl); @@ -1224,6 +1227,7 @@ static int flexcan_probe(struct platform_device *pdev) priv->reg_imask1_default = FLEXCAN_IFLAG_RX_FIFO_OVERFLOW | FLEXCAN_IFLAG_RX_FIFO_AVAILABLE | FLEXCAN_IFLAG_MB(priv->tx_mb_idx); + priv->reg_imask2_default = 0; priv->fifo.poll_pre_read = flexcan_poll_state; priv->fifo.poll_post_read = flexcan_poll_bus_err; -- 2.6.2