Commit 9dd094ee authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-5.20-20220625' of... 

Merge tag 'linux-can-next-for-5.20-20220625' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
pull-request: can-next 2022-06-25

this is a pull request of 22 patches for net-next/master.

The first 2 patches target the xilinx driver. Srinivas Neeli's patch
adds Transmitter Delay Compensation (TDC) support, a patch by me fixes
a typo.

The next patch is by me and fixes a typo in the m_can driver.

Another patch by me allows the configuration of fixed bit rates
without need for do_set_bittiming callback.

The following 7 patches are by Vincent Mailhol and refactor the
can-dev module and Kbuild, de-inline the can_dropped_invalid_skb()
function, which has grown over the time, and drop outgoing skbs if the
controller is in listen only mode.

Max Staudt's patch fixes a reference in the networking/can.rst
documentation.

Vincent Mailhol provides 2 patches with cleanups for the etas_es58x
driver.

Conor Dooley adds bindings for the mpfs-can to the PolarFire SoC dtsi.

Another patch by me allows the configuration of fixed data bit rates
without need for do_set_data_bittiming callback.

The last 5 patches are by Frank Jungclaus. They prepare the esd_usb
driver to add support for the the CAN-USB/3 device in a later series.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c83bc86a c3d39612

Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/net/can/microchip,mpfs-can.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title:

  Microchip PolarFire SoC (MPFS) can controller



maintainers:

  - Conor Dooley <conor.dooley@microchip.com>



allOf:

  - $ref: can-controller.yaml#



properties:

  compatible:

    const: microchip,mpfs-can



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks



additionalProperties: false



examples:

  - |

    can@2010c000 {

        compatible = "microchip,mpfs-can";

        reg = <0x2010c000 0x1000>;

        clocks = <&clkcfg 17>;

        interrupt-parent = <&plic>;

        interrupts = <56>;

    };

Documentation/networking/can.rst

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ reflect the correct [#f1]_ traffic on the node the loopback of the sent 
data has to be performed right after a successful transmission. If

the CAN network interface is not capable of performing the loopback for

some reason the SocketCAN core can do this task as a fallback solution.

See :ref:`socketcan-local-loopback1` for details (recommended).

See :ref:`socketcan-local-loopback2` for details (recommended).



The loopback functionality is enabled by default to reflect standard

networking behaviour for CAN applications. Due to some requests from

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7420,6 +7420,13 @@ S: Maintained 
F:	include/linux/errseq.h

F:	lib/errseq.c









ESD CAN/USB DRIVERS









M:	Frank Jungclaus <frank.jungclaus@esd.eu>









R:	socketcan@esd.eu









L:	linux-can@vger.kernel.org









S:	Maintained









F:	drivers/net/can/usb/esd_usb.c

















ET131X NETWORK DRIVER









M:	Mark Einon <mark.einon@gmail.com>









S:	Odd Fixes
































arch/riscv/boot/dts/microchip/mpfs.dtsi



+18
−0






























Original line number
Diff line number
Diff line







@@ -339,6 +339,24 @@







			status = "disabled";









		};



















		can0: can@2010c000 {









			compatible = "microchip,mpfs-can";









			reg = <0x0 0x2010c000 0x0 0x1000>;









			clocks = <&clkcfg CLK_CAN0>;









			interrupt-parent = <&plic>;









			interrupts = <56>;









			status = "disabled";









		};



















		can1: can@2010d000 {









			compatible = "microchip,mpfs-can";









			reg = <0x0 0x2010d000 0x0 0x1000>;









			clocks = <&clkcfg CLK_CAN1>;









			interrupt-parent = <&plic>;









			interrupts = <57>;









			status = "disabled";









		};



















		mac0: ethernet@20110000 {









			compatible = "cdns,macb";









			reg = <0x0 0x20110000 0x0 0x2000>;
































drivers/net/Kconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -499,6 +499,8 @@ config NET_SB1000

















source "drivers/net/phy/Kconfig"



















source "drivers/net/can/Kconfig"



















source "drivers/net/mctp/Kconfig"



















source "drivers/net/mdio/Kconfig"