| From fb5f0b3ef69b95e665e4bbe8a3de7201f09f1071 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Richard=20Sch=C3=BCtz?= <rschuetz@uni-koblenz.de> |
| Date: Sun, 29 Oct 2017 13:03:22 +0100 |
| Subject: can: c_can: don't indicate triple sampling support for D_CAN |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Richard Schütz <rschuetz@uni-koblenz.de> |
| |
| commit fb5f0b3ef69b95e665e4bbe8a3de7201f09f1071 upstream. |
| |
| The D_CAN controller doesn't provide a triple sampling mode, so don't set |
| the CAN_CTRLMODE_3_SAMPLES flag in ctrlmode_supported. Currently enabling |
| triple sampling is a no-op. |
| |
| Signed-off-by: Richard Schütz <rschuetz@uni-koblenz.de> |
| Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/can/c_can/c_can_pci.c | 1 - |
| drivers/net/can/c_can/c_can_platform.c | 1 - |
| 2 files changed, 2 deletions(-) |
| |
| --- a/drivers/net/can/c_can/c_can_pci.c |
| +++ b/drivers/net/can/c_can/c_can_pci.c |
| @@ -178,7 +178,6 @@ static int c_can_pci_probe(struct pci_de |
| break; |
| case BOSCH_D_CAN: |
| priv->regs = reg_map_d_can; |
| - priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; |
| break; |
| default: |
| ret = -EINVAL; |
| --- a/drivers/net/can/c_can/c_can_platform.c |
| +++ b/drivers/net/can/c_can/c_can_platform.c |
| @@ -320,7 +320,6 @@ static int c_can_plat_probe(struct platf |
| break; |
| case BOSCH_D_CAN: |
| priv->regs = reg_map_d_can; |
| - priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; |
| priv->read_reg = c_can_plat_read_reg_aligned_to_16bit; |
| priv->write_reg = c_can_plat_write_reg_aligned_to_16bit; |
| priv->read_reg32 = d_can_plat_read_reg32; |