Commit 85ef87ba authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-5.19-20220419' of... 

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



Marc Kleine-Budde says:

====================
pull-request: can-next 2022-04-19

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

The first 2 patches are by me and target the CAN driver
infrastructure. One patch renames a function in the rx_offload helper
the other one updates the CAN bitrate calculation to prefer small bit
rate pre-scalers over larger ones, which is encouraged by the CAN in
Automation.

Kris Bahnsen contributes a patch to fix the links to Technologic
Systems web resources in the sja1000 driver.

Christophe Leroy's patch prepares the mpc5xxx_can driver for upcoming
powerpc header cleanup.

Minghao Chi's patch converts the flexcan driver to use
pm_runtime_resume_and_get().

The next 2 patches target the Xilinx CAN driver. Lukas Bulwahn's patch
fixes an entry in the MAINTAINERS file. A patch by me marks the bit
timing constants as const.

Wolfram Sang's patch documents r8a77961 support on the
renesas,rcar-canfd bindings document.

The next 2 patches are by me and add support for the mcp251863 chip to
the mcp251xfd driver.

The last 7 patches are by Pavel Pisa, Martin Jerabek et al. and add
the ctucanfd driver for the CTU CAN FD IP Core.
====================

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

Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml

0 → 100644
+63 −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/ctu,ctucanfd.yaml#

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



title: CTU CAN FD Open-source IP Core Device Tree Bindings



description: |

  Open-source CAN FD IP core developed at the Czech Technical University in Prague



  The core sources and documentation on project page

    [1] sources : https://gitlab.fel.cvut.cz/canbus/ctucanfd_ip_core

    [2] datasheet : https://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/doc/Datasheet.pdf



  Integration in Xilinx Zynq SoC based system together with

  OpenCores SJA1000 compatible controllers

    [3] project : https://gitlab.fel.cvut.cz/canbus/zynq/zynq-can-sja1000-top

  Martin Jerabek dimploma thesis with integration and testing

  framework description

    [4] PDF : https://dspace.cvut.cz/bitstream/handle/10467/80366/F3-DP-2019-Jerabek-Martin-Jerabek-thesis-2019-canfd.pdf



maintainers:

  - Pavel Pisa <pisa@cmp.felk.cvut.cz>

  - Ondrej Ille <ondrej.ille@gmail.com>

  - Martin Jerabek <martin.jerabek01@gmail.com>



properties:

  compatible:

    oneOf:

      - items:

          - const: ctu,ctucanfd-2

          - const: ctu,ctucanfd

      - const: ctu,ctucanfd



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    description: |

      phandle of reference clock (100 MHz is appropriate

      for FPGA implementation on Zynq-7000 system).

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks



additionalProperties: false



examples:

  - |

    ctu_can_fd_0: can@43c30000 {

      compatible = "ctu,ctucanfd";

      interrupts = <0 30 4>;

      clocks = <&clkc 15>;

      reg = <0x43c30000 0x10000>;

    };

Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml

+10 −9
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ $id: http://devicetree.org/schemas/net/can/microchip,mcp251xfd.yaml# 
$schema: http://devicetree.org/meta-schemas/core.yaml#



title:

  Microchip MCP2517FD and MCP2518FD stand-alone CAN controller device tree

  bindings

  Microchip MCP2517FD, MCP2518FD and MCP251863 stand-alone CAN

  controller device tree bindings



maintainers:

  - Marc Kleine-Budde <mkl@pengutronix.de>
@@ -17,13 +17,14 @@ allOf: 
properties:

  compatible:

    oneOf:

      - const: microchip,mcp2517fd

        description: for MCP2517FD

      - enum:

          - microchip,mcp2517fd

          - microchip,mcp2518fd

          - microchip,mcp251xfd

      - items:

          - enum:

              - microchip,mcp251863

          - const: microchip,mcp2518fd

        description: for MCP2518FD

      - const: microchip,mcp251xfd

        description: to autodetect chip variant



  reg:

    maxItems: 1

Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
              - renesas,r8a774e1-canfd     # RZ/G2H

              - renesas,r8a7795-canfd      # R-Car H3

              - renesas,r8a7796-canfd      # R-Car M3-W

              - renesas,r8a77961-canfd     # R-Car M3-W+

              - renesas,r8a77965-canfd     # R-Car M3-N

              - renesas,r8a77970-canfd     # R-Car V3M

              - renesas,r8a77980-canfd     # R-Car V3H

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ patternProperties: 
    description: Shenzen Chuangsiqi Technology Co.,Ltd.

  "^ctera,.*":

    description: CTERA Networks Intl.

  "^ctu,.*":

    description: Czech Technical University in Prague

  "^cubietech,.*":

    description: Cubietech, Ltd.

  "^cui,.*":

Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst

0 → 100644
+639 −0

File added.

Preview size limit exceeded, changes collapsed.