Commit 97083c21 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-6.6-20230719' of... 

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

Marc Kleine-Budde says:

====================
pull-request: can-next 2023-07-19

The first 2 patches are by Judith Mendez, target the m_can driver and
add hrtimer based polling support for TI AM62x SoCs, where the
interrupt of the MCU domain's m_can cores is not routed to the Cortex
A53 core.

A patch by Rob Herring converts the grcan driver to use the correct DT
include files.

Michal Simek and Srinivas Neeli add support for optional reset control
to the xilinx_can driver.

The next 2 patches are by Jimmy Assarsson and add support for new
Kvaser pciefd to the kvaser_pciefd driver.

Mao Zhu's patch for the ucan driver removes a repeated word from a
comment.

* tag 'linux-can-next-for-6.6-20230719' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next:
  can: ucan: Remove repeated word
  can: kvaser_pciefd: Add support for new Kvaser pciefd devices
  can: kvaser_pciefd: Move hardware specific constants and functions into a driver_data struct
  can: Explicitly include correct DT includes
  can: xilinx_can: Add support for controller reset
  dt-bindings: can: xilinx_can: Add reset description
  can: m_can: Add hrtimer to generate software interrupt
  dt-bindings: net: can: Remove interrupt properties for MCAN
====================

Link: https://lore.kernel.org/r/20230719072348.525039-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 36395b2e 03df47c1

Documentation/devicetree/bindings/net/can/bosch,m_can.yaml

+18 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ required: 
  - compatible

  - reg

  - reg-names

  - interrupts

  - interrupt-names

  - clocks

  - clock-names

  - bosch,mram-cfg
@@ -132,6 +130,7 @@ additionalProperties: false 


examples:

  - |

    // Example with interrupts

    #include <dt-bindings/clock/imx6sx-clock.h>

    can@20e8000 {

      compatible = "bosch,m_can";
@@ -149,4 +148,21 @@ examples: 
      };

    };



  - |

    // Example with timer polling

    #include <dt-bindings/clock/imx6sx-clock.h>

    can@20e8000 {

      compatible = "bosch,m_can";

      reg = <0x020e8000 0x4000>, <0x02298000 0x4000>;

      reg-names = "m_can", "message_ram";

      clocks = <&clks IMX6SX_CLK_CANFD>,

               <&clks IMX6SX_CLK_CANFD>;

      clock-names = "hclk", "cclk";

      bosch,mram-cfg = <0x0 0 0 32 0 0 0 1>;



      can-transceiver {

        max-bitrate = <5000000>;

      };

    };



...

Documentation/devicetree/bindings/net/can/xilinx,can.yaml

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    description: CAN Tx mailbox buffer count (CAN FD)



  resets:

    maxItems: 1



required:

  - compatible

  - reg

drivers/net/can/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -160,8 +160,13 @@ config CAN_KVASER_PCIEFD 
	    Kvaser PCIEcan 4xHS

	    Kvaser PCIEcan 2xHS v2

	    Kvaser PCIEcan HS v2

	    Kvaser PCIEcan 1xCAN v3

	    Kvaser PCIEcan 2xCAN v3

	    Kvaser PCIEcan 4xCAN v2

	    Kvaser Mini PCI Express HS v2

	    Kvaser Mini PCI Express 2xHS v2

	    Kvaser Mini PCI Express 1xCAN v3

	    Kvaser Mini PCI Express 2xCAN v3



config CAN_SLCAN

	tristate "Serial / USB serial CAN Adaptors (slcan)"

drivers/net/can/grcan.c

+2 −1
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ 
#include <linux/ethtool.h>

#include <linux/io.h>

#include <linux/can/dev.h>

#include <linux/platform_device.h>

#include <linux/spinlock.h>

#include <linux/of_platform.h>

#include <linux/of.h>

#include <linux/of_irq.h>



#include <linux/dma-mapping.h>

drivers/net/can/kvaser_pciefd.c

+230 −77

File changed.

Preview size limit exceeded, changes collapsed.