Skip to content

Commit 4dc8c87

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.8/mcp2200' into for-linus
- support for controlling mcp2200 GPIOs (Johannes Roith)
2 parents f60c352 + 740329d commit 4dc8c87

File tree

4 files changed

+403
-0
lines changed

4 files changed

+403
-0
lines changed

drivers/hid/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,15 @@ config HID_ALPS
12961296
Say Y here if you have a Alps touchpads over i2c-hid or usbhid
12971297
and want support for its special functionalities.
12981298

1299+
config HID_MCP2200
1300+
tristate "Microchip MCP2200 HID USB-to-GPIO bridge"
1301+
depends on USB_HID && GPIOLIB
1302+
help
1303+
Provides GPIO functionality over USB-HID through MCP2200 device.
1304+
1305+
To compile this driver as a module, choose M here: the module
1306+
will be called hid-mcp2200.ko.
1307+
12991308
config HID_MCP2221
13001309
tristate "Microchip MCP2221 HID USB-to-I2C/SMbus host support"
13011310
depends on USB_HID && I2C

drivers/hid/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ obj-$(CONFIG_HID_LOGITECH_HIDPP) += hid-logitech-hidpp.o
7979
obj-$(CONFIG_HID_MACALLY) += hid-macally.o
8080
obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o
8181
obj-$(CONFIG_HID_MALTRON) += hid-maltron.o
82+
obj-$(CONFIG_HID_MCP2200) += hid-mcp2200.o
8283
obj-$(CONFIG_HID_MCP2221) += hid-mcp2221.o
8384
obj-$(CONFIG_HID_MAYFLASH) += hid-mf.o
8485
obj-$(CONFIG_HID_MEGAWORLD_FF) += hid-megaworld.o

drivers/hid/hid-ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@
916916
#define USB_DEVICE_ID_PICK16F1454 0x0042
917917
#define USB_DEVICE_ID_PICK16F1454_V2 0xf2f7
918918
#define USB_DEVICE_ID_LUXAFOR 0xf372
919+
#define USB_DEVICE_ID_MCP2200 0x00df
919920
#define USB_DEVICE_ID_MCP2221 0x00dd
920921

921922
#define USB_VENDOR_ID_MICROSOFT 0x045e

0 commit comments

Comments
 (0)