Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Marc Kleine-Budde says:

====================
pull-request: can 2022-01-24

The first patch updates the email address of Brian Silverman from his
former employer to his private address.

The next patch fixes DT bindings information for the tcan4x5x SPI CAN
driver.

The following patch targets the m_can driver and fixes the
introduction of FIFO bulk read support.

Another patch for the tcan4x5x driver, which fixes the max register
value for the regmap config.

The last patch for the flexcan driver marks the RX mailbox support for
the MCF5441X as support.

* tag 'linux-can-fixes-for-5.17-20220124' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
can: flexcan: mark RX via mailboxes as supported on MCF5441X
can: tcan4x5x: regmap: fix max register value
can: m_can: m_can_fifo_{read,write}: don't read or write from/to FIFO if length is 0
dt-bindings: can: tcan4x5x: fix mram-cfg RX FIFO config
mailmap: update email address of Brian Silverman
====================

Link: https://lore.kernel.org/r/20220124175955.3464134-1-mkl@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

+11 -3
+1
.mailmap
··· 70 70 Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com> 71 71 Brian Avery <b.avery@hp.com> 72 72 Brian King <brking@us.ibm.com> 73 + Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com> 73 74 Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com> 74 75 Changbin Du <changbin.du@intel.com> <changbin.du@intel.com> 75 76 Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
+1 -1
Documentation/devicetree/bindings/net/can/tcan4x5x.txt
··· 31 31 #address-cells = <1>; 32 32 #size-cells = <1>; 33 33 spi-max-frequency = <10000000>; 34 - bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>; 34 + bosch,mram-cfg = <0x0 0 0 16 0 0 1 1>; 35 35 interrupt-parent = <&gpio1>; 36 36 interrupts = <14 IRQ_TYPE_LEVEL_LOW>; 37 37 device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+1
drivers/net/can/flexcan/flexcan-core.c
··· 296 296 static const struct flexcan_devtype_data fsl_mcf5441x_devtype_data = { 297 297 .quirks = FLEXCAN_QUIRK_BROKEN_PERR_STATE | 298 298 FLEXCAN_QUIRK_NR_IRQ_3 | FLEXCAN_QUIRK_NR_MB_16 | 299 + FLEXCAN_QUIRK_SUPPPORT_RX_MAILBOX | 299 300 FLEXCAN_QUIRK_SUPPPORT_RX_FIFO, 300 301 }; 301 302
+1 -1
drivers/net/can/flexcan/flexcan.h
··· 21 21 * Below is some version info we got: 22 22 * SOC Version IP-Version Glitch- [TR]WRN_INT IRQ Err Memory err RTR rece- FD Mode MB 23 23 * Filter? connected? Passive detection ption in MB Supported? 24 - * MCF5441X FlexCAN2 ? no yes no no yes no 16 24 + * MCF5441X FlexCAN2 ? no yes no no no no 16 25 25 * MX25 FlexCAN2 03.00.00.00 no no no no no no 64 26 26 * MX28 FlexCAN2 03.00.04.00 yes yes no no no no 64 27 27 * MX35 FlexCAN2 03.00.00.00 no no no no no no 64
+6
drivers/net/can/m_can/m_can.c
··· 336 336 u32 addr_offset = cdev->mcfg[MRAM_RXF0].off + fgi * RXF0_ELEMENT_SIZE + 337 337 offset; 338 338 339 + if (val_count == 0) 340 + return 0; 341 + 339 342 return cdev->ops->read_fifo(cdev, addr_offset, val, val_count); 340 343 } 341 344 ··· 348 345 { 349 346 u32 addr_offset = cdev->mcfg[MRAM_TXB].off + fpi * TXB_ELEMENT_SIZE + 350 347 offset; 348 + 349 + if (val_count == 0) 350 + return 0; 351 351 352 352 return cdev->ops->write_fifo(cdev, addr_offset, val, val_count); 353 353 }
+1 -1
drivers/net/can/m_can/tcan4x5x-regmap.c
··· 12 12 #define TCAN4X5X_SPI_INSTRUCTION_WRITE (0x61 << 24) 13 13 #define TCAN4X5X_SPI_INSTRUCTION_READ (0x41 << 24) 14 14 15 - #define TCAN4X5X_MAX_REGISTER 0x8ffc 15 + #define TCAN4X5X_MAX_REGISTER 0x87fc 16 16 17 17 static int tcan4x5x_regmap_gather_write(void *context, 18 18 const void *reg, size_t reg_len,