pull-request: can 2021-08-10
Subsystems (4)
Marc Kleine-Budde
maintainerHello Jakub, hello David,
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.
regards,
Marc
---
The following changes since commit 143a8526ab5fd4f8a0c4fe2a9cb28c181dc5a95f:
bareudp: Fix invalid read beyond skb's linear data (2021-08-09 15:37:43 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-5.14-20210810
for you to fetch changes up to aae32b784ebdbda6f6055a8021c9fb8a0ab5bcba:
can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register (2021-08-10 08:10:27 +0200)
----------------------------------------------------------------
linux-can-fixes-for-5.14-20210810
----------------------------------------------------------------
Baruch Siach (1):
MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo
Hussein Alasadi (1):
can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register
MAINTAINERS | 2 +- drivers/net/can/m_can/m_can.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
Marc Kleine-Budde
maintainerPATCH 1/2 MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo
From: Baruch Siach <[email protected]>
This patch fixes the abbreviated name of the Microchip CAN BUS Analyzer Tool.
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -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 <[email protected]> L: [email protected] S: Maintained
base-commit: 143a8526ab5fd4f8a0c4fe2a9cb28c181dc5a95f
Signature · 1 line
2.30.2
Marc Kleine-Budde
maintainerPATCH 2/2 can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register
In reply to Marc Kleine-BuddeFrom: Hussein Alasadi <[email protected]>
This patch fixes the setting of the M_CAN_DBTP register contents:
- use DBTP_ (the data bitrate macros) instead of NBTP_ which area used for the nominal bitrate
- do not overwrite possibly-existing DBTP_TDC flag by ORing reg_btp instead of overwriting
--- drivers/net/can/m_can/m_can.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/can/m_can/m_can.c +4 -4
@@ -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); }
Signature · 1 line
2.30.2
This pull request was applied to netdev/net.git (refs/heads/master):
Hello:
This pull request was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Tue, 10 Aug 2021 08:37:00 +0200 you wrote:
Hello Jakub, hello David,
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
MAINTAINERSfile.[...]
Here is the summary with links:
- pull-request: can 2021-08-10
https://git.kernel.org/netdev/net/c/31782a01d14f - [net,2/2] can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register https://git.kernel.org/netdev/net/c/aae32b784ebd
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html