Commit 0ddd83fb authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: m_can: remove support for custom bit timing 

Since commit aee2b3cc ("can: tcan4x5x: fix bittiming const, use
common bittiming from m_can driver") there is no use of the device
specific bit timing parameters (m_can_classdev::bit_timing and struct
m_can_classdev::data_timing).

This patch removes the support for custom bit timing from the driver,
as the common bit timing works for all known IP core implementations.

Cc: Chandrasekar Ramakrishnan <rcsekar@samsung.com>
Link: https://lore.kernel.org/r/20210616102811.2449426-7-mkl@pengutronix.de


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 9808dba1

drivers/net/can/m_can/m_can.c

+6 −18
Original line number Diff line number Diff line
@@ -1440,32 +1440,20 @@ static int m_can_dev_setup(struct m_can_classdev *cdev) 
	case 30:

		/* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.0.x */

		can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO);

		cdev->can.bittiming_const = cdev->bit_timing ?

			cdev->bit_timing : &m_can_bittiming_const_30X;



		cdev->can.data_bittiming_const = cdev->data_timing ?

			cdev->data_timing :

			&m_can_data_bittiming_const_30X;

		cdev->can.bittiming_const = &m_can_bittiming_const_30X;

		cdev->can.data_bittiming_const = &m_can_data_bittiming_const_30X;

		break;

	case 31:

		/* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.1.x */

		can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO);

		cdev->can.bittiming_const = cdev->bit_timing ?

			cdev->bit_timing : &m_can_bittiming_const_31X;



		cdev->can.data_bittiming_const = cdev->data_timing ?

			cdev->data_timing :

			&m_can_data_bittiming_const_31X;

		cdev->can.bittiming_const = &m_can_bittiming_const_31X;

		cdev->can.data_bittiming_const = &m_can_data_bittiming_const_31X;

		break;

	case 32:

	case 33:

		/* Support both MCAN version v3.2.x and v3.3.0 */

		cdev->can.bittiming_const = cdev->bit_timing ?

			cdev->bit_timing : &m_can_bittiming_const_31X;



		cdev->can.data_bittiming_const = cdev->data_timing ?

			cdev->data_timing :

			&m_can_data_bittiming_const_31X;

		cdev->can.bittiming_const = &m_can_bittiming_const_31X;

		cdev->can.data_bittiming_const = &m_can_data_bittiming_const_31X;



		cdev->can.ctrlmode_supported |=

			(m_can_niso_supported(cdev) ?

drivers/net/can/m_can/m_can.h

+0 −3
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ struct m_can_classdev { 
	struct sk_buff *tx_skb;

	struct phy *transceiver;



	struct can_bittiming_const *bit_timing;

	struct can_bittiming_const *data_timing;



	struct m_can_ops *ops;



	int version;