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

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

Merge tag 'linux-can-next-for-4.12-20170425' of... 

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



Marc Kleine-Budde says:

====================
pull-request: can-next 2017-04-25

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

There are 4 patches by Stephane Grosjean for the PEAK PCAN-PCIe FD
CAN-FD boards. The next 7 patches are by Mario Huettel, which add
support for M_CAN IP version >= v3.1.x to the m_can driver. A patch by
Remigiusz Kołłątaj adds support for the Microchip CAN BUS Analyzer. 8
patches by Oliver Hartkopp complete the initial CAN network namespace
support. Wei Yongjun's patch for the ti_hecc driver fixes the return
value check in the probe function.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3133822f b655f0e9

drivers/net/can/Kconfig

+19 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,24 @@ config CAN_VCAN 
	  This driver can also be built as a module.  If so, the module

	  This driver can also be built as a module.  If so, the module

	  will be called vcan.

	  will be called vcan.





config CAN_VXCAN

	tristate "Virtual CAN Tunnel (vxcan)"

	---help---

	  Similar to the virtual ethernet driver veth, vxcan implements a

	  local CAN traffic tunnel between two virtual CAN network devices.

	  When creating a vxcan, two vxcan devices are created as pair.

	  When one end receives the packet it appears on its pair and vice

	  versa. The vxcan can be used for cross namespace communication.



	  In opposite to vcan loopback devices the vxcan only forwards CAN

	  frames to its pair and does *not* provide a local echo of sent

	  CAN frames. To disable a potential echo in af_can.c the vxcan driver

	  announces IFF_ECHO in the interface flags. To have a clean start

	  in each namespace the CAN GW hop counter is set to zero.



	  This driver can also be built as a module.  If so, the module

	  will be called vxcan.



config CAN_SLCAN

config CAN_SLCAN

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

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

	depends on TTY

	depends on TTY
@@ -142,6 +160,7 @@ source "drivers/net/can/cc770/Kconfig" 
source "drivers/net/can/ifi_canfd/Kconfig"

source "drivers/net/can/ifi_canfd/Kconfig"

source "drivers/net/can/m_can/Kconfig"

source "drivers/net/can/m_can/Kconfig"

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

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

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

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

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

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

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

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

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

drivers/net/can/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ 
#

#





obj-$(CONFIG_CAN_VCAN)		+= vcan.o

obj-$(CONFIG_CAN_VCAN)		+= vcan.o

obj-$(CONFIG_CAN_VXCAN)		+= vxcan.o

obj-$(CONFIG_CAN_SLCAN)		+= slcan.o

obj-$(CONFIG_CAN_SLCAN)		+= slcan.o





obj-$(CONFIG_CAN_DEV)		+= can-dev.o

obj-$(CONFIG_CAN_DEV)		+= can-dev.o
@@ -26,6 +27,7 @@ obj-$(CONFIG_CAN_IFI_CANFD) += ifi_canfd/ 
obj-$(CONFIG_CAN_JANZ_ICAN3)	+= janz-ican3.o

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

obj-$(CONFIG_CAN_MSCAN)		+= mscan/

obj-$(CONFIG_CAN_MSCAN)		+= mscan/

obj-$(CONFIG_CAN_M_CAN)		+= m_can/

obj-$(CONFIG_CAN_M_CAN)		+= m_can/

obj-$(CONFIG_CAN_PEAK_PCIEFD)	+= peak_canfd/

obj-$(CONFIG_CAN_SJA1000)	+= sja1000/

obj-$(CONFIG_CAN_SJA1000)	+= sja1000/

obj-$(CONFIG_CAN_SUN4I)		+= sun4i_can.o

obj-$(CONFIG_CAN_SUN4I)		+= sun4i_can.o

obj-$(CONFIG_CAN_TI_HECC)	+= ti_hecc.o

obj-$(CONFIG_CAN_TI_HECC)	+= ti_hecc.o

drivers/net/can/m_can/m_can.c

+585 −167

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/can/peak_canfd/Kconfig

0 → 100644
+13 −0
Original line number Original line Diff line number Diff line 
config CAN_PEAK_PCIEFD

	depends on PCI

	tristate "PEAK-System PCAN-PCIe FD cards"

	---help---

	  This driver adds support for the PEAK-System PCI Express FD

	  CAN-FD cards family.

	  These 1x or 2x CAN-FD channels cards offer CAN 2.0 a/b as well as

	  CAN-FD access to the CAN bus. Besides the nominal bitrate of up to

	  1 Mbit/s, the data bytes of CAN-FD frames can be transmitted with

	  up to 12 Mbit/s. A galvanic isolation of the CAN ports protects the

	  electronics of the card and the respective computer against

	  disturbances of up to 500 Volts. The PCAN-PCI Express FD can be

	  operated with ambient temperatures in a range of -40 to +85 °C.

drivers/net/can/peak_canfd/Makefile

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
#

# Makefile for the PEAK-System CAN-FD IP module drivers

#

obj-$(CONFIG_CAN_PEAK_PCIEFD) += peak_pciefd.o

peak_pciefd-y := peak_pciefd_main.o peak_canfd.o