diff options
| author | Marek Vasut <marex@denx.de> | 2016-05-08 00:34:13 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2016-05-09 11:07:28 +0200 |
| commit | 478ad12c9f5a2f5a1d39fc898b098992980d3abc (patch) | |
| tree | 3a6b0c78288d03d69645f623b94c075697699236 /drivers/net/can/ifi_canfd | |
| parent | be1861320a9ec599b6862ebb71db9bd3ad897150 (diff) | |
| download | linux-478ad12c9f5a2f5a1d39fc898b098992980d3abc.tar.bz2 | |
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: Marek 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: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/ifi_canfd')
| -rw-r--r-- | drivers/net/can/ifi_canfd/ifi_canfd.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c index b9efd6ec04c9..30dc3b676627 100644 --- a/drivers/net/can/ifi_canfd/ifi_canfd.c +++ b/drivers/net/can/ifi_canfd/ifi_canfd.c @@ -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; |