Commit 31782a01 authored Aug 10, 2021 by David S. Miller

Merge tag 'linux-can-fixes-for-5.14-20210810' of...

Merge tag 'linux-can-fixes-for-5.14-20210810' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



linux-can-fixes-for-5.14-20210810

Marc Kleine-Budde says:

====================
pull-request: can 2021-08-10

this is a pull request of 2 patches for net/master.

Baruch Siach's patch fixes a typo for the Microchip CAN BUS Analyzer
Tool entry in the MAINTAINERS file.

Hussein Alasadi fixes the setting of the M_CAN_DBTP register in the
m_can driver. The regression git mainline in v5.14-rc1, so no backport
to stable is needed.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 6a279f61 aae32b78

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -11327,7 +11327,7 @@ W: https://linuxtv.org
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/radio/radio-maxiradio*

		MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER
		MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER
		R: Yasushi SHOJI <yashi@spacecubics.com>
		L: linux-can@vger.kernel.org
		S: Maintained

drivers/net/can/m_can/m_can.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1164,10 +1164,10 @@ static int m_can_set_bittiming(struct net_device *dev)
		FIELD_PREP(TDCR_TDCO_MASK, tdco));
		}

		reg_btp = FIELD_PREP(NBTP_NBRP_MASK, brp) \|
		FIELD_PREP(NBTP_NSJW_MASK, sjw) \|
		FIELD_PREP(NBTP_NTSEG1_MASK, tseg1) \|
		FIELD_PREP(NBTP_NTSEG2_MASK, tseg2);
		reg_btp \|= FIELD_PREP(DBTP_DBRP_MASK, brp) \|
		FIELD_PREP(DBTP_DSJW_MASK, sjw) \|
		FIELD_PREP(DBTP_DTSEG1_MASK, tseg1) \|
		FIELD_PREP(DBTP_DTSEG2_MASK, tseg2);

		m_can_write(cdev, M_CAN_DBTP, reg_btp);
		}