OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5297381
)
can: m_can: Removed initialization of FIFO water marks
author
Mario Huettel
<mario.huettel@gmx.net>
Sat, 8 Apr 2017 12:10:10 +0000
(14:10 +0200)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Tue, 25 Apr 2017 07:00:46 +0000
(09:00 +0200)
FIFO water marks disabled because the driver doesn't handle water mark
events.
Signed-off-by: Mario Huettel <mario.huettel@gmx.net>
Reviewed-by: Oliver Hartkopp <socketcan@hartkopp.net>
Tested-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/m_can/m_can.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/m_can/m_can.c
b/drivers/net/can/m_can/m_can.c
index
6797977
..
ddcbe8b
100644
(file)
--- a/
drivers/net/can/m_can/m_can.c
+++ b/
drivers/net/can/m_can/m_can.c
@@
-864,11
+864,11
@@
static void m_can_chip_config(struct net_device *dev)
/* rx fifo configuration, blocking mode, fifo size 1 */
m_can_write(priv, M_CAN_RXF0C,
(priv->mcfg[MRAM_RXF0].num << RXFC_FS_OFF) |
-
RXFC_FWM_1 |
priv->mcfg[MRAM_RXF0].off);
+ priv->mcfg[MRAM_RXF0].off);
m_can_write(priv, M_CAN_RXF1C,
(priv->mcfg[MRAM_RXF1].num << RXFC_FS_OFF) |
-
RXFC_FWM_1 |
priv->mcfg[MRAM_RXF1].off);
+ priv->mcfg[MRAM_RXF1].off);
cccr = m_can_read(priv, M_CAN_CCCR);
cccr &= ~(CCCR_TEST | CCCR_MON | (CCCR_CMR_MASK << CCCR_CMR_SHIFT) |