Hello David, this is a pull request for net-next/master consisting of 32 patches. The first patch is by Gustavo A. R. Silva and removes unused code in the generic CAN infrastructure. The next three patches target the mcp251x driver. The one by Andy Shevchenko removes the legacy platform data support from the driver. The other two are by Timo Schlüßler and reset the device only when needed, to prevent glitches on the output when GPIO support is added. I'm contributing two patches fixing checkpatch warnings in the c_can_platform and peak_canfd driver. Stephane Grosjean's patch for the peak_canfd driver adds hw timestamps support in rx skbs. The next three patches target the xilinx_can driver. One patch by me to fix checkpatch warnings, one patch by Anssi Hannula to avoid non requested bus error frames, and a patch by YueHaibing that switches the driver to devm_platform_ioremap_resource(). Pankaj Sharma contributes two patches for the m_can driver, the first one adds support for one shot mode, the other support for handling arbitration errors. Followed by four patches by YueHaibing, switching the grcan, ifi, rcar, and sun4i drivers to devm_platform_ioremap_resource() I'm contributing cleanup patches for the rx-offload helper, while Joakim Zhang's patch prepares the rx-offload helper for CAN-FD support. The rx offload users flexcan and ti_hecc are converted accordingly. The remaining twelve patches target the flexcan driver. First Joakim Zhang switches the driver to devm_platform_ioremap_resource(). The remaining eleven patch are by me and clean up the abstract the access of the iflag1 and iflag2 register both for RX and TX mailboxes. This is a preparation for the upcoming CAN-FD support. regards, Marc --- The following changes since commit 228200179213bfc9b4d6097e1c26de30bd18c1e6: Support LAN743x PTP periodic output on any GPIO (2019-11-11 12:46:56 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.5-20191111 for you to fetch changes up to b9468ad8ff65e6dcfeb69cab15deecafdb883643: can: flexcan: flexcan_mailbox_read() make use of flexcan_write64() to mark the mailbox as read (2019-11-11 21:58:12 +0100) ---------------------------------------------------------------- linux-can-next-for-5.5-20191111 ---------------------------------------------------------------- Andy Shevchenko (1): can: mcp251x: get rid of legacy platform data Anssi Hannula (1): can: xilinx_can: avoid non-requested bus error frames Gustavo A. R. Silva (1): can: dev: can_restart(): remove unused code Joakim Zhang (2): can: rx-offload: Prepare for CAN FD support can: flexcan: use devm_platform_ioremap_resource() to simplify code Marc Kleine-Budde (17): can: c_can: c_can_plaform: fix checkpatch warnings can: peak_canfd: fix checkpatch warnings can: xilinx_can: fix checkpatch warnings can: rx-offload: fix long lines can: rx-offload: can_rx_offload_compare(): fix typo can: rx-offload: can_rx_offload_irq_offload_timestamp(): don't use assignment in if condition can: rx-offload: can_rx_offload_reset(): remove no-op function can: flexcan: flexcan_irq_state(): only read timestamp if needed can: flexcan: rename macro FLEXCAN_IFLAG_MB() -> FLEXCAN_IFLAG2_MB() can: flexcan: flexcan_irq(): rename variable reg_iflag -> reg_iflag_rx can: flexcan: rename struct flexcan_priv::reg_imask{1,2}_default to rx_mask{1,2} can: flexcan: remove TX mailbox bit from struct flexcan_priv::rx_mask{1,2} can: flexcan: convert struct flexcan_priv::rx_mask{1,2} to rx_mask can: flexcan: introduce struct flexcan_priv::tx_mask and make use of it can: flexcan: flexcan_read_reg_iflag_rx(): optimize reading can: flexcan: flexcan_irq(): add support for TX mailbox in iflag1 can: flexcan: flexcan_mailbox_read() make use of flexcan_write64() to mark the mailbox as read Pankaj Sharma (2): can: m_can: add support for one shot mode can: m_can: add support for handling arbitration error Stephane Grosjean (1): can: peak_canfd: provide hw timestamps in rx skbs Timo Schlüßler (2): can: mcp251x: add mcp251x_write_2regs() and make use of it can: mcp251x: only reset hardware as required YueHaibing (5): can: xilinx_can: use devm_platform_ioremap_resource() to simplify code can: grcan: use devm_platform_ioremap_resource() to simplify code can: ifi: use devm_platform_ioremap_resource() to simplify code can: rcar: use devm_platform_ioremap_resource() to simplify code can: sun4i: use devm_platform_ioremap_resource() to simplify code arch/arm/mach-pxa/icontrol.c | 9 +- arch/arm/mach-pxa/zeus.c | 9 +- drivers/net/can/c_can/c_can_platform.c | 21 +++-- drivers/net/can/dev.c | 5 +- drivers/net/can/flexcan.c | 131 +++++++++++++++----------- drivers/net/can/grcan.c | 4 +- drivers/net/can/ifi_canfd/ifi_canfd.c | 4 +- drivers/net/can/m_can/m_can.c | 54 ++++++++++- drivers/net/can/peak_canfd/peak_canfd.c | 25 +++-- drivers/net/can/peak_canfd/peak_canfd_user.h | 3 +- drivers/net/can/peak_canfd/peak_pciefd_main.c | 6 +- drivers/net/can/rcar/rcar_can.c | 4 +- drivers/net/can/rcar/rcar_canfd.c | 4 +- drivers/net/can/rx-offload.c | 122 +++++++++--------------- drivers/net/can/spi/mcp251x.c | 75 ++++++++++++--- drivers/net/can/sun4i_can.c | 4 +- drivers/net/can/ti_hecc.c | 26 +++-- drivers/net/can/xilinx_can.c | 102 ++++++++++---------- include/linux/can/platform/mcp251x.h | 22 ----- include/linux/can/rx-offload.h | 7 +- 20 files changed, 360 insertions(+), 277 deletions(-) delete mode 100644 include/linux/can/platform/mcp251x.h -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |- Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature