Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'linux-can-next-for-5.4-20190724' of... 

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



Marc Kleine-Budde says:

====================
pull-request: can-next 2019-07-24

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

The first two patches are by me. One adds missing files of the CAN
subsystem to the MAINTAINERS file, while the other sorts the
Makefile/Kconfig of the sja1000 drivers sub directory. In the next patch
Ji-Ze Hong (Peter Hong) provides a driver for the "Fintek PCIE to 2 CAN"
controller, based on the the sja1000 IP core.

Gustavo A. R. Silva's patch for the kvaser_usb driver introduces the use
of struct_size() instead of open coding it. Henning Colliander's patch
adds a driver for the "Kvaser PCIEcan" devices.

Another patch by Gustavo A. R. Silva marks expected switch fall-throughs
properly.

Dan Murphy provides 5 patches for the m_can. After cleanups a framework
is introduced so that the driver can be used from memory mapped IO as
well as SPI attached devices. Finally he adds a driver for the tcan4x5x
which uses this framework.

A series of 5 patches by Appana Durga Kedareswara rao for the xilinx_can
driver, first clean up,then add support for CANFD. Colin Ian King
contributes another cleanup for the xilinx_can driver.

Robert P. J. Day's patch corrects the brief history of the CAN protocol
given in the Kconfig menu entry.

2 patches by Dong Aisheng for the flexcan driver provide PE clock source
select support and dt-bindings description.
2 patches by Sean Nyekjaer for the flexcan driver provide add CAN
wakeup-source property and dt-bindings description.

Jeroen Hofstee's patch converts the ti_hecc driver to make use of the
rx-offload helper fixing a number of outstanding bugs.

The first patch of Oliver Hartkopp removes the now obsolete empty
ioctl() handler for the CAN protocols. The second patch adds SPDX
license identifiers for CAN subsystem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 570d785b fba76a58

Documentation/devicetree/bindings/net/can/fsl-flexcan.txt

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,15 @@ Optional properties: 
		 ack_gpr is the gpr register offset of CAN stop acknowledge.

		 ack_bit is the bit offset of CAN stop acknowledge.



- fsl,clk-source: Select the clock source to the CAN Protocol Engine (PE).

		  It's SoC Implementation dependent. Refer to RM for detailed

		  definition. If this property is not set in device tree node

		  then driver selects clock source 1 by default.

		  0: clock source 0 (oscillator clock)

		  1: clock source 1 (peripheral clock)



- wakeup-source: enable CAN remote wakeup



Example:



	can@1c000 {
@@ -40,4 +49,5 @@ Example: 
		interrupts = <48 0x2>;

		interrupt-parent = <&mpic>;

		clock-frequency = <200000000>; // filled in by bootloader

		fsl,clk-source = <0>; // select clock source 0 for PE

	};

Documentation/devicetree/bindings/net/can/tcan4x5x.txt

0 → 100644
+37 −0
Original line number Diff line number Diff line 
Texas Instruments TCAN4x5x CAN Controller

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



This file provides device node information for the TCAN4x5x interface contains.



Required properties:

	- compatible: "ti,tcan4x5x"

	- reg: 0

	- #address-cells: 1

	- #size-cells: 0

	- spi-max-frequency: Maximum frequency of the SPI bus the chip can

			     operate at should be less than or equal to 18 MHz.

	- data-ready-gpios: Interrupt GPIO for data and error reporting.

	- device-wake-gpios: Wake up GPIO to wake up the TCAN device.



See Documentation/devicetree/bindings/net/can/m_can.txt for additional

required property details.



Optional properties:

	- reset-gpios: Hardwired output GPIO. If not defined then software

		       reset.

	- device-state-gpios: Input GPIO that indicates if the device is in

			      a sleep state or if the device is active.



Example:

tcan4x5x: tcan4x5x@0 {

		compatible = "ti,tcan4x5x";

		reg = <0>;

		#address-cells = <1>;

		#size-cells = <1>;

		spi-max-frequency = <10000000>;

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

		data-ready-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

		device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

		device-wake-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;

};

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -3631,9 +3631,12 @@ S: Maintained 
F:	Documentation/devicetree/bindings/net/can/

F:	drivers/net/can/

F:	include/linux/can/dev.h

F:	include/linux/can/led.h

F:	include/linux/can/rx-offload.h

F:	include/linux/can/platform/

F:	include/uapi/linux/can/error.h

F:	include/uapi/linux/can/netlink.h

F:	include/uapi/linux/can/vxcan.h



CAN NETWORK LAYER

M:	Oliver Hartkopp <socketcan@hartkopp.net>
@@ -3646,6 +3649,8 @@ S: Maintained 
F:	Documentation/networking/can.rst

F:	net/can/

F:	include/linux/can/core.h

F:	include/linux/can/skb.h

F:	include/net/netns/can.h

F:	include/uapi/linux/can.h

F:	include/uapi/linux/can/bcm.h

F:	include/uapi/linux/can/raw.h

drivers/net/can/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -120,6 +120,19 @@ config CAN_JANZ_ICAN3 
	  This driver can also be built as a module. If so, the module will be

	  called janz-ican3.ko.



config CAN_KVASER_PCIEFD

	depends on PCI

	tristate "Kvaser PCIe FD cards"

	  help

	  This is a driver for the Kvaser PCI Express CAN FD family.



	  Supported devices:

	    Kvaser PCIEcan 4xHS

	    Kvaser PCIEcan 2xHS v2

	    Kvaser PCIEcan HS v2

	    Kvaser Mini PCI Express HS v2

	    Kvaser Mini PCI Express 2xHS v2



config CAN_SUN4I

	tristate "Allwinner A10 CAN controller"

	depends on MACH_SUN4I || MACH_SUN7I || COMPILE_TEST

drivers/net/can/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o 
obj-$(CONFIG_CAN_GRCAN)		+= grcan.o

obj-$(CONFIG_CAN_IFI_CANFD)	+= ifi_canfd/

obj-$(CONFIG_CAN_JANZ_ICAN3)	+= janz-ican3.o

obj-$(CONFIG_CAN_KVASER_PCIEFD)	+= kvaser_pciefd.o

obj-$(CONFIG_CAN_MSCAN)		+= mscan/

obj-$(CONFIG_CAN_M_CAN)		+= m_can/

obj-$(CONFIG_CAN_PEAK_PCIEFD)	+= peak_canfd/