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

Commit f155d9c0 authored by Maximilian Schneider's avatar Maximilian Schneider Committed by Marc Kleine-Budde
Browse files

can: gs_usb: Add Basic support for the bytewerk.org candleLight interface 



This patchs adds basic support for the bytewerk.org candleLight interface,
a open hardware (CERN OHL) USB CAN adapter.

Signed-off-by: default avatarHubert Denkmair <hubert@denkmair.de>
Signed-off-by: default avatarMaximilian Schneider <max@schneidersoft.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 43200a44

drivers/net/can/usb/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ config CAN_ESD_USB2 
config CAN_GS_USB

	tristate "Geschwister Schneider UG interfaces"

	---help---

	  This driver supports the Geschwister Schneider USB/CAN devices.

	  This driver supports the Geschwister Schneider and bytewerk.org

	  candleLight USB CAN interfaces USB/CAN devices

	  If unsure choose N,

	  choose Y for built in support,

	  M to compile as module (module will be named: gs_usb).

drivers/net/can/usb/gs_usb.c

+11 −3
Original line number Diff line number Diff line 
/* CAN driver for Geschwister Schneider USB/CAN devices.

/* CAN driver for Geschwister Schneider USB/CAN devices

 * and bytewerk.org candleLight USB CAN interfaces.

 *

 * Copyright (C) 2013 Geschwister Schneider Technologie-,

 * Copyright (C) 2013-2016 Geschwister Schneider Technologie-,

 * Entwicklungs- und Vertriebs UG (Haftungsbeschränkt).

 * Copyright (C) 2016 Hubert Denkmair

 *

 * Many thanks to all socketcan devs!

 *
@@ -29,6 +31,9 @@ 
#define USB_GSUSB_1_VENDOR_ID      0x1d50

#define USB_GSUSB_1_PRODUCT_ID     0x606f



#define USB_CANDLELIGHT_VENDOR_ID  0x1209

#define USB_CANDLELIGHT_PRODUCT_ID 0x2323



#define GSUSB_ENDPOINT_IN          1

#define GSUSB_ENDPOINT_OUT         2
@@ -952,6 +957,8 @@ static void gs_usb_disconnect(struct usb_interface *intf) 
static const struct usb_device_id gs_usb_table[] = {

	{ USB_DEVICE_INTERFACE_NUMBER(USB_GSUSB_1_VENDOR_ID,

				      USB_GSUSB_1_PRODUCT_ID, 0) },

	{ USB_DEVICE_INTERFACE_NUMBER(USB_CANDLELIGHT_VENDOR_ID,

				      USB_CANDLELIGHT_PRODUCT_ID, 0) },

	{} /* Terminating entry */

};
@@ -969,5 +976,6 @@ module_usb_driver(gs_usb_driver); 
MODULE_AUTHOR("Maximilian Schneider <mws@schneidersoft.net>");

MODULE_DESCRIPTION(

"Socket CAN device driver for Geschwister Schneider Technologie-, "

"Entwicklungs- und Vertriebs UG. USB2.0 to CAN interfaces.");

"Entwicklungs- und Vertriebs UG. USB2.0 to CAN interfaces\n"

"and bytewerk.org candleLight USB CAN interfaces.");

MODULE_LICENSE("GPL v2");