Commit d0c4dd9f authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge tag 'linux-can-next-for-6.12-20240904-2' of... 

Merge tag 'linux-can-next-for-6.12-20240904-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2024-09-04-2

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

All 18 patches add support for CAN-FD IP core found on Rockchip
RK3568.

The first patch is co-developed by Elaine Zhang and me and adds DT
bindings documentation.

The remaining 17 patches are by me and add the driver in several
stages.

linux-can-next-for-6.12-20240904-2

* tag 'linux-can-next-for-6.12-20240904-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next:
  can: rockchip_canfd: add support for CAN_CTRLMODE_BERR_REPORTING
  can: rockchip_canfd: add support for CAN_CTRLMODE_LOOPBACK
  can: rockchip_canfd: add hardware timestamping support
  can: rockchip_canfd: enable full TX-FIFO depth of 2
  can: rockchip_canfd: prepare to use full TX-FIFO depth
  can: rockchip_canfd: add stats support for errata workarounds
  can: rockchip_canfd: rkcanfd_get_berr_counter_corrected(): work around broken {RX,TX}ERRORCNT register
  can: rockchip_canfd: implement workaround for erratum 12
  can: rockchip_canfd: implement workaround for erratum 6
  can: rockchip_canfd: add TX PATH
  can: rockchip_canfd: rkcanfd_register_done(): add warning for erratum 5
  can: rockchip_canfd: rkcanfd_handle_rx_int_one(): implement workaround for erratum 5: check for empty FIFO
  can: rockchip_canfd: add notes about known issues
  can: rockchip_canfd: add support for rk3568v3
  can: rockchip_canfd: add quirk for broken CAN-FD support
  can: rockchip_canfd: add quirks for errata workarounds
  can: rockchip_canfd: add driver for Rockchip CAN-FD controller
  dt-bindings: can: rockchip_canfd: add rockchip CAN-FD controller
====================

Link: https://patch.msgid.link/20240904130256.1965582-1-mkl@pengutronix.de


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 335cc75c 9d56d4aa

Documentation/devicetree/bindings/net/can/rockchip,rk3568v2-canfd.yaml

0 → 100644
+74 −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/rockchip,rk3568v2-canfd.yaml#

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



title:

  Rockchip CAN-FD controller



maintainers:

  - Marc Kleine-Budde <mkl@pengutronix.de>



allOf:

  - $ref: can-controller.yaml#



properties:

  compatible:

    oneOf:

      - const: rockchip,rk3568v2-canfd

      - items:

          - const: rockchip,rk3568v3-canfd

          - const: rockchip,rk3568v2-canfd



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: baud

      - const: pclk



  resets:

    maxItems: 2



  reset-names:

    items:

      - const: core

      - const: apb



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - resets



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/rk3568-cru.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/irq.h>



    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        can@fe570000 {

            compatible = "rockchip,rk3568v2-canfd";

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

            interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

            clocks = <&cru CLK_CAN0>, <&cru PCLK_CAN0>;

            clock-names = "baud", "pclk";

            resets = <&cru SRST_CAN0>, <&cru SRST_P_CAN0>;

            reset-names = "core", "apb";

        };

    };

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -19730,6 +19730,14 @@ F: Documentation/ABI/*/sysfs-driver-hid-roccat* 
F:	drivers/hid/hid-roccat*

F:	include/linux/hid-roccat*









ROCKCHIP CAN-FD DRIVER









M:	Marc Kleine-Budde <mkl@pengutronix.de>









R:	kernel@pengutronix.de









L:	linux-can@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/can/rockchip,rk3568v2-canfd.yaml









F:	drivers/net/can/rockchip/

















ROCKCHIP CRYPTO DRIVERS









M:	Corentin Labbe <clabbe@baylibre.com>









L:	linux-crypto@vger.kernel.org

























drivers/net/can/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -225,6 +225,7 @@ source "drivers/net/can/m_can/Kconfig"







source "drivers/net/can/mscan/Kconfig"









source "drivers/net/can/peak_canfd/Kconfig"









source "drivers/net/can/rcar/Kconfig"









source "drivers/net/can/rockchip/Kconfig"









source "drivers/net/can/sja1000/Kconfig"









source "drivers/net/can/softing/Kconfig"









source "drivers/net/can/spi/Kconfig"
































drivers/net/can/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -10,6 +10,7 @@ obj-$(CONFIG_CAN_SLCAN)		+= slcan/







obj-y				+= dev/









obj-y				+= esd/









obj-y				+= rcar/









obj-y				+= rockchip/









obj-y				+= spi/









obj-y				+= usb/









obj-y				+= softing/
































drivers/net/can/rockchip/Kconfig
0 → 100644



+9
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0



















config CAN_ROCKCHIP_CANFD









	tristate "Rockchip CAN-FD controller"









	depends on OF || COMPILE_TEST









	select CAN_RX_OFFLOAD









	help









	  Say Y here if you want to use CAN-FD controller found on









	  Rockchip SoCs.