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

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

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



linux-can-next-for-6.6-20230728

Marc Kleine-Budde says:

====================
Hello netdev-team,

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

The 1st patch is by Gerhard Uttenthaler, which adds Gerhard as the
maintainer ems_pci driver.

Peter Seiderer's patch removes a unused function from the peak_usb
driver.

The next 4 patches are by John Watts and add support for the sun4i_can
driver on the Allwinner D1.

Rob Herring's patch corrects the DT includes in various CAN drivers.

Followed by 14 patches from me concerning the gs_usb driver. The first
11 are various cleanups consisting of coding style improvements, error
path printout cleanups, and removal of unneeded
usb_kill_anchored_urbs(). The last 3 convert the driver to use NAPI to
avoid out-of-order reception of CAN frames.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 91fcb99c 52be626c

Documentation/devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
          - const: allwinner,sun4i-a10-can

      - const: allwinner,sun4i-a10-can

      - const: allwinner,sun8i-r40-can

      - const: allwinner,sun20i-d1-can



  reg:

    maxItems: 1
@@ -37,8 +38,9 @@ properties: 
if:

  properties:

    compatible:

      contains:

        const: allwinner,sun8i-r40-can

      enum:

        - allwinner,sun8i-r40-can

        - allwinner,sun20i-d1-can



then:

  required:

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7606,6 +7606,13 @@ L: linux-mmc@vger.kernel.org 
S:	Supported

F:	drivers/mmc/host/cqhci*









EMS CPC-PCI CAN DRIVER









M:	Gerhard Uttenthaler <uttenthaler@ems-wuensche.com>









M:	support@ems-wuensche.com









L:	linux-can@vger.kernel.org









S:	Maintained









F:	drivers/net/can/sja1000/ems_pci.c

















EMULEX 10Gbps iSCSI - OneConnect DRIVER









M:	Ketan Mukadam <ketan.mukadam@broadcom.com>









L:	linux-scsi@vger.kernel.org
































arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi



+30
−0






























Original line number
Diff line number
Diff line







@@ -131,6 +131,18 @@







				pins = "PB6", "PB7";









				function = "uart3";









			};



















			/omit-if-no-ref/









			can0_pins: can0-pins {









				pins = "PB2", "PB3";









				function = "can0";









			};



















			/omit-if-no-ref/









			can1_pins: can1-pins {









				pins = "PB4", "PB5";









				function = "can1";









			};









		};



















		ccu: clock-controller@2001000 {








@@ -879,5 +891,23 @@







			clock-names = "bus", "hosc", "ahb";









			#clock-cells = <1>;









		};



















		can0: can@2504000 {









			compatible = "allwinner,sun20i-d1-can";









			reg = <0x02504000 0x400>;









			interrupts = <SOC_PERIPHERAL_IRQ(21) IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&ccu CLK_BUS_CAN0>;









			resets = <&ccu RST_BUS_CAN0>;









			status = "disabled";









		};



















		can1: can@2504400 {









			compatible = "allwinner,sun20i-d1-can";









			reg = <0x02504400 0x400>;









			interrupts = <SOC_PERIPHERAL_IRQ(22) IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&ccu CLK_BUS_CAN1>;









			resets = <&ccu RST_BUS_CAN1>;









			status = "disabled";









		};









	};









};
























drivers/net/can/Kconfig



+2
−2






























Original line number
Diff line number
Diff line







@@ -190,10 +190,10 @@ config CAN_SLCAN

















config CAN_SUN4I









	tristate "Allwinner A10 CAN controller"









	depends on MACH_SUN4I || MACH_SUN7I || COMPILE_TEST









	depends on MACH_SUN4I || MACH_SUN7I || RISCV || COMPILE_TEST









	help









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









	  A10/A20 SoCs.









	  A10/A20/D1 SoCs.



















	  To compile this driver as a module, choose M here: the module will









	  be called sun4i_can.
































drivers/net/can/bxcan.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -23,7 +23,6 @@







#include <linux/mfd/syscon.h>









#include <linux/module.h>









#include <linux/of.h>









#include <linux/of_device.h>









#include <linux/platform_device.h>









#include <linux/regmap.h>