linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: kernel@pengutronix.de, bhupesh.sharma@freescale.com,
	Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH v2 08/11] can: flexcan: reg_imask2_default
Date: Thu, 10 Dec 2015 13:33:54 +0100	[thread overview]
Message-ID: <1449750837-11376-9-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1449750837-11376-1-git-send-email-mkl@pengutronix.de>

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 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, &regs->ctrl);
 	flexcan_write(priv->reg_imask1_default, &regs->imask1);
+	flexcan_write(priv->reg_imask2_default, &regs->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, &regs->imask2);
 	flexcan_write(0, &regs->imask1);
 	flexcan_write(priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_ALL,
 		      &regs->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


  parent reply	other threads:[~2015-12-10 12:33 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-10 12:33 [PATCH v2 00/11] RFC: cleanup flexcan driver, introduce and make use of IRQ offloading Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 01/11] can: flexcan: calculate default value for imask1 during runtime Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 02/11] can: flexcan: make TX mailbox selectable " Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 03/11] can: rx-fifo: Add support for simple irq offloading Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 04/11] can: flexcan: make use of rx-fifo's irq_offload_simple Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 05/11] can: flexcan: add missing register definitions Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 06/11] can: flexcan: activate individual RX masking and initialize reg_rximr Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 07/11] can: flexcan: add quirk FLEXCAN_QUIRK_ENABLE_EACEN_RRS Marc Kleine-Budde
2015-12-10 12:33 ` Marc Kleine-Budde [this message]
2015-12-10 12:33 ` [PATCH v2 09/11] can: rx-fifo: introduce software rx-fifo implementation Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 10/11] can: flexcan: add support for rx-fifo based software FIFO implementation Marc Kleine-Budde
2015-12-10 12:33 ` [PATCH v2 11/11] can: flexcan: switch imx6 and vf610 to software based fifo Marc Kleine-Budde
     [not found] ` <CAOpc7mGK9WEnbowHJONbP-szW7mVQbU46uUPXF8V09omqWLQMA@mail.gmail.com>
2015-12-10 14:04   ` [PATCH v2 00/11] RFC: cleanup flexcan driver, introduce and make use of IRQ offloading Marc Kleine-Budde
2016-01-18 11:14 ` Holger Schurig
2016-01-18 22:04   ` Marc Kleine-Budde
2016-01-19  0:26     ` Tom Evans
2016-02-22 15:16       ` Mirza Krak
2016-02-22 15:19         ` Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449750837-11376-9-git-send-email-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=bhupesh.sharma@freescale.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-can@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).