diff options
| author | David S. Miller | 2017-11-11 13:52:01 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-11-11 13:52:01 +0100 |
| commit | 92d28828179675176cd90293699b394b6d22ce68 (patch) | |
| tree | a59ab85f275679d36aeea7bc998f0c350569f0f0 /drivers/net/can/ifi_canfd/ifi_canfd.c | |
| parent | Merge tag 'mlx5-fixes-2017-11-08' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | can: ifi: Fix transmitter delay calculation (diff) | |
| download | kernel-qcow2-linux-92d28828179675176cd90293699b394b6d22ce68.tar.gz kernel-qcow2-linux-92d28828179675176cd90293699b394b6d22ce68.tar.xz kernel-qcow2-linux-92d28828179675176cd90293699b394b6d22ce68.zip | |
Merge tag 'linux-can-fixes-for-4.14-20171110' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2017-11-10
this is a pull request for net/master.
The first patch by Richard Schütz for the c_can driver removes the false
indication to support triple sampling for d_can. Gerhard Bertelsmann's
patch for the sun4i driver improves the RX overrun handling. The patch
by Stephane Grosjean for the peak_canfd driver adds the PCI ids for
various new PCIe/M2 interfaces. Marek Vasut's patch for the ifi driver
fix transmitter delay calculation.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/ifi_canfd/ifi_canfd.c')
| -rw-r--r-- | drivers/net/can/ifi_canfd/ifi_canfd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c index 4d1fe8d95042..2772d05ff11c 100644 --- a/drivers/net/can/ifi_canfd/ifi_canfd.c +++ b/drivers/net/can/ifi_canfd/ifi_canfd.c @@ -670,9 +670,9 @@ static void ifi_canfd_set_bittiming(struct net_device *ndev) priv->base + IFI_CANFD_FTIME); /* Configure transmitter delay */ - tdc = (dbt->brp * (dbt->phase_seg1 + 1)) & IFI_CANFD_TDELAY_MASK; - writel(IFI_CANFD_TDELAY_EN | IFI_CANFD_TDELAY_ABS | tdc, - priv->base + IFI_CANFD_TDELAY); + tdc = dbt->brp * (dbt->prop_seg + dbt->phase_seg1); + tdc &= IFI_CANFD_TDELAY_MASK; + writel(IFI_CANFD_TDELAY_EN | tdc, priv->base + IFI_CANFD_TDELAY); } static void ifi_canfd_set_filter(struct net_device *ndev, const u32 id, |