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

Merge tag 'linux-can-next-for-6.2-20221212' of... 

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



Marc Kleine-Budde says:

====================
linux-can-next-for-6.2-20221212

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

The first 2 patches are by me fix a warning and coding style in the
kvaser_usb driver.

Vivek Yadav's patch sorts the includes of the m_can driver.

Biju Das contributes 5 patches for the rcar_canfd driver improve the
support for different IP core variants.

Jean Delvare's patch for the ctucanfd drops the dependency on
COMPILE_TEST.

Vincent Mailhol's patch sorts the includes of the etas_es58x driver.

Haibo Chen's contributes 2 patches that add i.MX93 support to the
flexcan driver.

Lad Prabhakar's patch updates the dt-bindings documentation of the
rcar_canfd driver.

Minghao Chi's patch converts the c_can platform driver to
devm_platform_get_and_ioremap_resource().

In the next 7 patches Vincent Mailhol adds devlink support to the
etas_es58x driver to report firmware, bootloader and hardware version.

Xu Panda's patch converts a strncpy() -> strscpy() in the ucan driver.

Ye Bin's patch removes a useless parameter from the AF_CAN protocol.

The next 2 patches by Vincent Mailhol and remove unneeded or unused
pointers to struct usb_interface in device's priv struct in the ucan
and gs_usb driver.

Vivek Yadav's patch cleans up the usage of the RAM initialization in
the m_can driver.

A patch by me add support for SO_MARK to the AF_CAN protocol.

Geert Uytterhoeven's patch fixes the number of CAN channels in the
rcan_canfd bindings documentation.

In the last 11 patches Markus Schneider-Pargmann optimizes the
register access in the t_can driver and cleans up the tcan glue
driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 21af0d55 47bf2b23

Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
  compatible:

    oneOf:

      - enum:

          - fsl,imx93-flexcan

          - fsl,imx8qm-flexcan

          - fsl,imx8mp-flexcan

          - fsl,imx6q-flexcan

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

+73 −62
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ title: Renesas R-Car CAN FD Controller 
maintainers:

  - Fabrizio Castro <fabrizio.castro.jz@renesas.com>



allOf:

  - $ref: can-controller.yaml#



properties:

  compatible:

    oneOf:
@@ -33,7 +30,7 @@ properties: 


      - items:

          - enum:

              - renesas,r9a07g043-canfd    # RZ/G2UL

              - renesas,r9a07g043-canfd    # RZ/G2UL and RZ/Five

              - renesas,r9a07g044-canfd    # RZ/G2{L,LC}

              - renesas,r9a07g054-canfd    # RZ/V2L

          - const: renesas,rzg2l-canfd     # RZ/G2L family
@@ -77,12 +74,13 @@ properties: 
    description: Maximum frequency of the CANFD clock.



patternProperties:

  "^channel[01]$":

  "^channel[0-7]$":

    type: object

    description:

      The controller supports two channels and each is represented as a child

      node.  Each child node supports the "status" property only, which

      is used to enable/disable the respective channel.

      The controller supports multiple channels and each is represented as a

      child node.  Each channel can be enabled/disabled individually.



    additionalProperties: false



required:

  - compatible
@@ -98,7 +96,10 @@ required: 
  - channel0

  - channel1



if:

allOf:

  - $ref: can-controller.yaml#



  - if:

      properties:

        compatible:

          contains:
@@ -153,6 +154,16 @@ else: 
        resets:

          maxItems: 1



  - if:

      not:

        properties:

          compatible:

            contains:

              const: renesas,r8a779a0-canfd

    then:

      patternProperties:

        "^channel[2-7]$": false



unevaluatedProperties: false



examples:

Documentation/networking/devlink/devlink-info.rst

+5 −0
Original line number Diff line number Diff line
@@ -198,6 +198,11 @@ fw.bundle_id 


Unique identifier of the entire firmware bundle.



fw.bootloader

-------------



Version of the bootloader.



Future work

===========

Documentation/networking/devlink/etas_es58x.rst

0 → 100644
+36 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



==========================

etas_es58x devlink support

==========================



This document describes the devlink features implemented by the

``etas_es58x`` device driver.



Info versions

=============



The ``etas_es58x`` driver reports the following versions



.. list-table:: devlink info versions implemented

   :widths: 5 5 90



   * - Name

     - Type

     - Description

   * - ``fw``

     - running

     - Version of the firmware running on the device. Also available

       through ``ethtool -i`` as the first member of the

       ``firmware-version``.

   * - ``fw.bootloader``

     - running

     - Version of the bootloader running on the device. Also available

       through ``ethtool -i`` as the second member of the

       ``firmware-version``.

   * - ``board.rev``

     - fixed

     - The hardware revision of the device.

   * - ``serial_number``

     - fixed

     - The USB serial number. Also available through ``lsusb -v``.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7682,6 +7682,7 @@ ETAS ES58X CAN/USB DRIVER 
M:	Vincent Mailhol <mailhol.vincent@wanadoo.fr>

L:	linux-can@vger.kernel.org

S:	Maintained

F:	Documentation/networking/devlink/etas_es58x.rst

F:	drivers/net/can/usb/etas_es58x/









ETHERNET BRIDGE