[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210527084532.1384031-1-mkl@pengutronix.de>
Date: Thu, 27 May 2021 10:45:11 +0200
From: Marc Kleine-Budde <mkl@...gutronix.de>
To: netdev@...r.kernel.org
Cc: davem@...emloft.net, kuba@...nel.org, linux-can@...r.kernel.org,
kernel@...gutronix.de
Subject: pull-request: can-next 2021-05-27
Hello Jakub, hello David,
this is a pull request of 21 patches for net-next/master. I hope
that's OK, as http://vger.kernel.org/~davem/net-next.html still says
closed.
The first 2 patches are by Geert Uytterhoeven and convert the rcan_can
and rcan_canfd device tree bindings to yaml.
The next 2 patches are by Oliver Hartkopp and me and update the CAN
uapi headers.
zuoqilin's patch removes an unnecessary variable from the CAN proc
code.
Patrick Menschel contributes 3 patches for CAN ISOTP to enhance the
error messages.
Jiapeng Chong's patch removes two dead stores from the softing driver.
The next 4 patches are by me and silence several warnings found by
clang compiler.
Jimmy Assarsson's patches for the kvaser_usb driver add support for
the Kvaser hydra devices.
Dario Binacchi provides 2 patches for the c_can driver, first removing
an unused variable, then adding basic ethtool support to query driver
and ring parameter info.
The last 4 patches are by Torin Cooper-Bennun and clean up the m_can
driver.
regards,
Marc
---
The following changes since commit 59c56342459a483d5e563ed8b5fdb77ab7622a73:
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue (2021-05-26 18:33:01 -0700)
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.14-20210527
for you to fetch changes up to 50fe7547b637b3cf51876ce9ec829e79d76e5de0:
can: m_can: fix whitespace in a few comments (2021-05-27 09:42:24 +0200)
----------------------------------------------------------------
linux-can-next-for-5.14-20210527
----------------------------------------------------------------
Dario Binacchi (2):
can: c_can: remove unused variable struct c_can_priv::rxmasked
can: c_can: add ethtool support
Geert Uytterhoeven (2):
dt-bindings: can: rcar_can: Convert to json-schema
dt-bindings: can: rcar_canfd: Convert to json-schema
Jiapeng Chong (1):
can: softing: Remove redundant variable ptr
Jimmy Assarsson (2):
can: kvaser_usb: Rename define USB_HYBRID_{,PRO_}CANLIN_PRODUCT_ID
can: kvaser_usb: Add new Kvaser hydra devices
Marc Kleine-Budde (5):
can: uapi: update CAN-FD frame description
can: hi311x: hi3110_can_probe(): silence clang warning
can: mcp251x: mcp251x_can_probe(): silence clang warning
can: mcp251xfd: silence clang warning
can: at91_can: silence clang warning
Oliver Hartkopp (1):
can: uapi: introduce CANFD_FDF flag for mixed content in struct canfd_frame
Patrick Menschel (3):
can: isotp: change error format from decimal to symbolic error names
can: isotp: add symbolic error message to isotp_module_init()
can: isotp: Add error message if txqueuelen is too small
Torin Cooper-Bennun (4):
can: m_can: use bits.h macros for all regmasks
can: m_can: clean up CCCR reg defs, order by revs
can: m_can: make TXESC, RXESC config more explicit
can: m_can: fix whitespace in a few comments
zuoqilin (1):
can: proc: remove unnecessary variables
.../devicetree/bindings/net/can/rcar_can.txt | 80 -------
.../devicetree/bindings/net/can/rcar_canfd.txt | 107 ---------
.../bindings/net/can/renesas,rcar-can.yaml | 139 ++++++++++++
.../bindings/net/can/renesas,rcar-canfd.yaml | 122 +++++++++++
drivers/net/can/at91_can.c | 2 +-
drivers/net/can/c_can/Makefile | 5 +
drivers/net/can/c_can/c_can.h | 3 +-
drivers/net/can/c_can/c_can_ethtool.c | 43 ++++
drivers/net/can/c_can/{c_can.c => c_can_main.c} | 2 +-
drivers/net/can/m_can/m_can.c | 244 ++++++++++-----------
drivers/net/can/softing/softing_main.c | 2 -
drivers/net/can/spi/hi311x.c | 2 +-
drivers/net/can/spi/mcp251x.c | 2 +-
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +-
drivers/net/can/usb/Kconfig | 2 +
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 14 +-
include/uapi/linux/can.h | 13 +-
net/can/isotp.c | 20 +-
net/can/proc.c | 6 +-
19 files changed, 463 insertions(+), 347 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/can/rcar_can.txt
delete mode 100644 Documentation/devicetree/bindings/net/can/rcar_canfd.txt
create mode 100644 Documentation/devicetree/bindings/net/can/renesas,rcar-can.yaml
create mode 100644 Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml
create mode 100644 drivers/net/can/c_can/c_can_ethtool.c
rename drivers/net/can/c_can/{c_can.c => c_can_main.c} (99%)
Powered by blists - more mailing lists