Merge tag 'linux-can-next-for-5.11-20201120' of...
Merge tag 'linux-can-next-for-5.11-20201120' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== pull-request: can-next 2020-11-20 The first patch is by Yegor Yefremov and he improves the j1939 documentaton by adding tables for the CAN identifier and its fields. Then there are 8 patches by Oliver Hartkopp targeting the CAN driver infrastructure and drivers. These add support for optional DLC element to the Classical CAN frame structure. See patch ea780056 ("can: add optional DLC element to Classical CAN frame structure") for details. Oliver's last patch adds len8_dlc support to several drivers. Stefan Mätje provides a patch to add len8_dlc support to the esd_usb2 driver. The next patch is by Oliver Hartkopp, too and adds support for modification of Classical CAN DLCs to CAN GW sockets. The next 3 patches target the nxp,flexcan DT bindings. One patch by my adds the missing uint32 reference to the clock-frequency property. Joakim Zhang's patches fix the fsl,clk-source property and add the IMX_SC_R_CAN() macro to the imx firmware header file, which will be used in the flexcan driver later. Another patch by Joakim Zhang prepares the flexcan driver for SCU based stop-mode, by giving the existing, GPR based stop-mode, a _GPR postfix. The next 5 patches are by me, target the flexcan driver, and clean up the .ndo_open and .ndo_stop callbacks. These patches try to fix a sporadically hanging flexcan_close() during simultanious ifdown, sending of CAN messages and probably open CAN bus. I was never able to reproduce, but these seem to fix the problem at the reporting user. As these changes are rather big, I'd like to mainline them via net-next/master. The next patches are by Jimmy Assarsson and Christer Beskow, they add support for new USB devices to the existing kvaser_usb driver. The last patch is by Kaixu Xia and simplifies the return in the mcp251xfd_chip_softreset() function in the mcp251xfd driver. * tag 'linux-can-next-for-5.11-20201120' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (25 commits) can: mcp251xfd: remove useless code in mcp251xfd_chip_softreset can: kvaser_usb: Add new Kvaser hydra devices can: kvaser_usb: kvaser_usb_hydra: Add support for new device variant can: kvaser_usb: Add new Kvaser Leaf v2 devices can: kvaser_usb: Add USB_{LEAF,HYDRA}_PRODUCT_ID_END defines can: flexcan: flexcan_close(): change order if commands to properly shut down the controller can: flexcan: flexcan_open(): completely initialize controller before requesting IRQ can: flexcan: flexcan_rx_offload_setup(): factor out mailbox and rx-offload setup into separate function can: flexcan: move enabling/disabling of interrupts from flexcan_chip_{start,stop}() to callers can: flexcan: factor out enabling and disabling of interrupts into separate function can: flexcan: rename macro FLEXCAN_QUIRK_SETUP_STOP_MODE -> FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR dt-bindings: firmware: add IMX_SC_R_CAN(x) macro for CAN dt-bindings: can: fsl,flexcan: fix fsl,clk-source property dt-bindings: can: fsl,flexcan: add uint32 reference to clock-frequency property can: gw: support modification of Classical CAN DLCs can: drivers: add len8_dlc support for esd_usb2 CAN adapter can: drivers: add len8_dlc support for various CAN adapters can: drivers: introduce helpers to access Classical CAN DLC values can: update documentation for DLC usage in Classical CAN can: rename CAN FD related can_len2dlc and can_dlc2len helpers ... ==================== Link: https://lore.kernel.org/r/20201120133318.3428231-1-mkl@pengutronix.de Signed-off-by:Jakub Kicinski <kuba@kernel.org>
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml 3 additions, 2 deletionsDocumentation/devicetree/bindings/net/can/fsl,flexcan.yaml
- Documentation/networking/can.rst 53 additions, 17 deletionsDocumentation/networking/can.rst
- Documentation/networking/j1939.rst 42 additions, 4 deletionsDocumentation/networking/j1939.rst
- drivers/net/can/at91_can.c 7 additions, 7 deletionsdrivers/net/can/at91_can.c
- drivers/net/can/c_can/c_can.c 10 additions, 10 deletionsdrivers/net/can/c_can/c_can.c
- drivers/net/can/cc770/cc770.c 7 additions, 7 deletionsdrivers/net/can/cc770/cc770.c
- drivers/net/can/dev.c 8 additions, 8 deletionsdrivers/net/can/dev.c
- drivers/net/can/flexcan.c 95 additions, 66 deletionsdrivers/net/can/flexcan.c
- drivers/net/can/grcan.c 5 additions, 5 deletionsdrivers/net/can/grcan.c
- drivers/net/can/ifi_canfd/ifi_canfd.c 5 additions, 5 deletionsdrivers/net/can/ifi_canfd/ifi_canfd.c
- drivers/net/can/janz-ican3.c 10 additions, 10 deletionsdrivers/net/can/janz-ican3.c
- drivers/net/can/kvaser_pciefd.c 5 additions, 5 deletionsdrivers/net/can/kvaser_pciefd.c
- drivers/net/can/m_can/m_can.c 6 additions, 6 deletionsdrivers/net/can/m_can/m_can.c
- drivers/net/can/mscan/mscan.c 10 additions, 10 deletionsdrivers/net/can/mscan/mscan.c
- drivers/net/can/pch_can.c 7 additions, 7 deletionsdrivers/net/can/pch_can.c
- drivers/net/can/peak_canfd/peak_canfd.c 8 additions, 8 deletionsdrivers/net/can/peak_canfd/peak_canfd.c
- drivers/net/can/rcar/rcar_can.c 7 additions, 7 deletionsdrivers/net/can/rcar/rcar_can.c
- drivers/net/can/rcar/rcar_canfd.c 6 additions, 6 deletionsdrivers/net/can/rcar/rcar_canfd.c
- drivers/net/can/rx-offload.c 1 addition, 1 deletiondrivers/net/can/rx-offload.c
- drivers/net/can/sja1000/sja1000.c 8 additions, 8 deletionsdrivers/net/can/sja1000/sja1000.c
Loading
Please register or sign in to comment