git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From b9ce406423461f726c3c05f2e09faf987a4bdb77 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Tue, 20 Oct 2020 23:53:55 +0800
   4 Subject: can: flexcan: remove FLEXCAN_QUIRK_DISABLE_MECR quirk for LS1021A
   5
   6 From: Joakim Zhang <qiangqing.zhang@nxp.com>
   7
   8 [ Upstream commit 018799649071a1638c0c130526af36747df4355a ]
   9
  10 After double check with Layerscape CAN owner (Pankaj Bansal), confirm that
  11 LS1021A doesn't support ECC feature, so remove FLEXCAN_QUIRK_DISABLE_MECR
  12 quirk.
  13
  14 Fixes: 99b7668c04b27 ("can: flexcan: adding platform specific details for LS1021A")
  15 Cc: Pankaj Bansal <pankaj.bansal@nxp.com>
  16 Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  17 Link: https://lore.kernel.org/r/20201020155402.30318-4-qiangqing.zhang@nxp.com
  18 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  19 Signed-off-by: Sasha Levin <sashal@kernel.org>
  20 ---
  21  drivers/net/can/flexcan.c | 3 +--
  22  1 file changed, 1 insertion(+), 2 deletions(-)
  23
  24 diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
  25 index d59c6c87164f4..fbf812cf4f5da 100644
  26 --- a/drivers/net/can/flexcan.c
  27 +++ b/drivers/net/can/flexcan.c
  28 @@ -321,8 +321,7 @@ static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
  29
  30  static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
  31         .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
  32 -               FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
  33 -               FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
  34 +               FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
  35  };
  36
  37  static const struct can_bittiming_const flexcan_bittiming_const = {
  38 --
  39 2.27.0
  40