Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 478ad12c authored by Marek Vasut's avatar Marek Vasut Committed by Marc Kleine-Budde
Browse files

can: ifi: Unify timing constants 



There is no distinction between bittiming constants for the slow and
fast part of the CANFD operation on this controller, so just use one
single bittiming constant set.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent be186132

drivers/net/can/ifi_canfd/ifi_canfd.c

+1 −13
Original line number Diff line number Diff line
@@ -544,18 +544,6 @@ static const struct can_bittiming_const ifi_canfd_bittiming_const = { 
	.brp_inc	= 1,

};



static const struct can_bittiming_const ifi_canfd_data_bittiming_const = {

	.name		= KBUILD_MODNAME,

	.tseg1_min	= 1,	/* Time segment 1 = prop_seg + phase_seg1 */

	.tseg1_max	= 256,

	.tseg2_min	= 2,	/* Time segment 2 = phase_seg2 */

	.tseg2_max	= 256,

	.sjw_max	= 128,

	.brp_min	= 2,

	.brp_max	= 512,

	.brp_inc	= 1,

};



static void ifi_canfd_set_bittiming(struct net_device *ndev)

{

	struct ifi_canfd_priv *priv = netdev_priv(ndev);
@@ -866,7 +854,7 @@ static int ifi_canfd_plat_probe(struct platform_device *pdev) 
	priv->can.clock.freq = readl(addr + IFI_CANFD_CANCLOCK);



	priv->can.bittiming_const	= &ifi_canfd_bittiming_const;

	priv->can.data_bittiming_const	= &ifi_canfd_data_bittiming_const;

	priv->can.data_bittiming_const	= &ifi_canfd_bittiming_const;

	priv->can.do_set_mode		= ifi_canfd_set_mode;

	priv->can.do_get_berr_counter	= ifi_canfd_get_berr_counter;