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

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

Merge tag 'linux-can-next-for-3.20-20150128' of... 

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



Marc Kleine-Budde says:

====================
pull-request: can-next 2015-28-01

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

There are 3 patches by Ahmed S. Darwish, which update the kvaser_usb
driver and add support for the USBcan-II based adapters. Stéphane
Grosjean contributes 7 patches for the peak_usb driver, which add
support for the CANFD USB adapters. I contribute 2 patches which clean
up the peak_usb driver structure a bit.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4b222ca6 0a25e1f4

drivers/net/can/usb/Kconfig

+18 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ config CAN_KVASER_USB 
	tristate "Kvaser CAN/USB interface"

	---help---

	  This driver adds support for Kvaser CAN/USB devices like Kvaser

	  Leaf Light.

	  Leaf Light and Kvaser USBcan II.



	  The driver provides support for the following devices:

	    - Kvaser Leaf Light
@@ -46,6 +46,12 @@ config CAN_KVASER_USB 
	    - Kvaser USBcan R

	    - Kvaser Leaf Light v2

	    - Kvaser Mini PCI Express HS

	    - Kvaser USBcan II HS/HS

	    - Kvaser USBcan II HS/LS

	    - Kvaser USBcan Rugged ("USBcan Rev B")

	    - Kvaser Memorator HS/HS

	    - Kvaser Memorator HS/LS

	    - Scania VCI2 (if you have the Kvaser logo on top)



	  If unsure, say N.
@@ -53,10 +59,18 @@ config CAN_KVASER_USB 
	  module will be called kvaser_usb.



config CAN_PEAK_USB

	tristate "PEAK PCAN-USB/USB Pro interfaces"

	tristate "PEAK PCAN-USB/USB Pro interfaces for CAN 2.0b/CAN-FD"

	---help---

	  This driver supports the PCAN-USB and PCAN-USB Pro adapters

	  from PEAK-System Technik (http://www.peak-system.com).

	  This driver supports the PEAK-System Technik USB adapters that enable

	  access to the CAN bus, with repect to the CAN 2.0b and/or CAN-FD

	  standards, that is:



	  PCAN-USB             single CAN 2.0b channel USB adapter

	  PCAN-USB Pro         dual CAN 2.0b channels USB adapter

	  PCAN-USB FD          single CAN-FD channel USB adapter

	  PCAN-USB Pro FD      dual CAN-FD channels USB adapter



	  (see also http://www.peak-system.com).



config CAN_8DEV_USB

	tristate "8 devices USB2CAN interface"