Commit 8ba3c81c authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.13/ft260' into for-linus 

- Support for FTDI FT260 I2C host adapter from Michael Zaidman
parents 743b3576 2076b7bd

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7278,6 +7278,13 @@ F: fs/verity/ 
F:	include/linux/fsverity.h

F:	include/uapi/linux/fsverity.h









FT260 FTDI USB-HID TO I2C BRIDGE DRIVER









M:	Michael Zaidman <michael.zaidman@gmail.com>









L:	linux-i2c@vger.kernel.org









L:	linux-input@vger.kernel.org









S:	Maintained









F:	drivers/hid/hid-ft260.c

















FUJITSU LAPTOP EXTRAS









M:	Jonathan Woithe <jwoithe@just42.net>









L:	platform-driver-x86@vger.kernel.org


































drivers/hid/Kconfig



+11
−0






























Original line number
Diff line number
Diff line







@@ -351,6 +351,17 @@ config HID_EZKEY







	help









	Support for Ezkey BTC 8193 keyboard.



















config HID_FT260









	tristate "FTDI FT260 USB HID to I2C host support"









	depends on USB_HID && HIDRAW && I2C









	help









	  Provides I2C host adapter functionality over USB-HID through FT260









	  device. The customizable USB descriptor fields are exposed as sysfs









	  attributes.



















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









	  will be called hid-ft260.



















config HID_GEMBIRD









	tristate "Gembird Joypad"









	depends on HID


































drivers/hid/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -46,6 +46,7 @@ obj-$(CONFIG_HID_ELAN)		+= hid-elan.o







obj-$(CONFIG_HID_ELECOM)	+= hid-elecom.o









obj-$(CONFIG_HID_ELO)		+= hid-elo.o









obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o









obj-$(CONFIG_HID_FT260)		+= hid-ft260.o









obj-$(CONFIG_HID_GEMBIRD)	+= hid-gembird.o









obj-$(CONFIG_HID_GFRM)		+= hid-gfrm.o









obj-$(CONFIG_HID_GLORIOUS)  += hid-glorious.o


































drivers/hid/hid-ft260.c
0 → 100644



+1054
−0




























File added.
Preview size limit exceeded, changes collapsed.
























drivers/hid/hid-ids.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -431,6 +431,7 @@

















#define USB_VENDOR_ID_FUTURE_TECHNOLOGY	0x0403









#define USB_DEVICE_ID_RETRODE2		0x97c1









#define USB_DEVICE_ID_FT260             0x6030



















#define USB_VENDOR_ID_ESSENTIAL_REALITY	0x0d7f









#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100