Commit c3d39612 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

Merge branch 'preparation-for-supporting-esd-CAN-USB-3' 

Frank Jungclaus says:
====================
All following 5 patches must be seen as preparation for adding support
of the newly available esd CAN-USB/3 to esd_usb2.c.

After having gained some confidence and experience on sending patches
to linux-can@vger.kernel.org, I'll again submit the code changes for
CAN-USB/3 support as step #2.
====================

Link: https://lore.kernel.org/all/20220624190517.2299701-1-frank.jungclaus@esd.eu


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parents ec30c109 ce87c0f1

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7406,6 +7406,13 @@ S: Maintained 
F:	include/linux/errseq.h

F:	lib/errseq.c









ESD CAN/USB DRIVERS









M:	Frank Jungclaus <frank.jungclaus@esd.eu>









R:	socketcan@esd.eu









L:	linux-can@vger.kernel.org









S:	Maintained









F:	drivers/net/can/usb/esd_usb.c

















ET131X NETWORK DRIVER









M:	Mark Einon <mark.einon@gmail.com>









S:	Odd Fixes


































drivers/net/can/usb/Kconfig



+11
−4






























Original line number
Diff line number
Diff line







@@ -14,11 +14,18 @@ config CAN_EMS_USB







	  This driver is for the one channel CPC-USB/ARM7 CAN/USB interface









	  from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).



















config CAN_ESD_USB2









	tristate "ESD USB/2 CAN/USB interface"









config CAN_ESD_USB









	tristate "esd electronics gmbh CAN/USB interfaces"









	help









	  This driver supports the CAN-USB/2 interface









	  from esd electronic system design gmbh (http://www.esd.eu).









	  This driver adds supports for several CAN/USB interfaces









	  from esd electronics gmbh (https://www.esd.eu).



















	  The drivers supports the following devices:









	    - esd CAN-USB/2









	    - esd CAN-USB/Micro



















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









	  will be called esd_usb.



















config CAN_ETAS_ES58X









	tristate "ETAS ES58X CAN/USB interfaces"


































drivers/net/can/usb/Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -5,7 +5,7 @@

















obj-$(CONFIG_CAN_8DEV_USB) += usb_8dev.o









obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o









obj-$(CONFIG_CAN_ESD_USB2) += esd_usb2.o









obj-$(CONFIG_CAN_ESD_USB) += esd_usb.o









obj-$(CONFIG_CAN_ETAS_ES58X) += etas_es58x/









obj-$(CONFIG_CAN_GS_USB) += gs_usb.o









obj-$(CONFIG_CAN_KVASER_USB) += kvaser_usb/


































drivers/net/can/usb/esd_usb2.c→drivers/net/can/usb/esd_usb.c



+121
−129




























File changed and moved.
Preview size limit exceeded, changes collapsed.