tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'input-for-v6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:

- a quirk to i8042 for yet another TUXEDO laptop

- a fix to mtk-pmic-keys driver to properly handle MT6359

- a fix to iqs7222 driver to only enable proximity interrupt
if it is mapped to a key or a switch event

- an update to xpad controller driver to recognize Flydigi Apex 5
controller

- an update to maintainers file to drop bounding entry for Melfas
touch controller

* tag 'input-for-v6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
MAINTAINERS: Input: Drop melfas-mip4 section
Input: mtk-pmic-keys - MT6359 has a specific release irq
Input: i8042 - add TUXEDO InfinityBook Pro Gen10 AMD to i8042 quirk table
Input: iqs7222 - avoid enabling unused interrupts
Input: xpad - add support for Flydigi Apex 5

Linus Torvalds 563b3f6e f83a4f2a

+23 -8
-7
MAINTAINERS
··· 15748 15748 W: http://www.melexis.com 15749 15749 F: drivers/iio/temperature/mlx90635.c 15750 15750 15751 - MELFAS MIP4 TOUCHSCREEN DRIVER 15752 - M: Sangwon Jee <jeesw@melfas.com> 15753 - S: Supported 15754 - W: http://www.melfas.com 15755 - F: Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt 15756 - F: drivers/input/touchscreen/melfas_mip4.c 15757 - 15758 15751 MELLANOX BLUEFIELD I2C DRIVER 15759 15752 M: Khalil Blaiech <kblaiech@nvidia.com> 15760 15753 M: Asmaa Mnebhi <asmaa@nvidia.com>
+2
drivers/input/joystick/xpad.c
··· 422 422 { 0x3537, 0x1010, "GameSir G7 SE", 0, XTYPE_XBOXONE }, 423 423 { 0x366c, 0x0005, "ByoWave Proteus Controller", MAP_SHARE_BUTTON, XTYPE_XBOXONE, FLAG_DELAY_INIT }, 424 424 { 0x3767, 0x0101, "Fanatec Speedster 3 Forceshock Wheel", 0, XTYPE_XBOX }, 425 + { 0x37d7, 0x2501, "Flydigi Apex 5", 0, XTYPE_XBOX360 }, 425 426 { 0x413d, 0x2104, "Black Shark Green Ghost Gamepad", 0, XTYPE_XBOX360 }, 426 427 { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX }, 427 428 { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN } ··· 579 578 XPAD_XBOX360_VENDOR(0x3537), /* GameSir Controllers */ 580 579 XPAD_XBOXONE_VENDOR(0x3537), /* GameSir Controllers */ 581 580 XPAD_XBOXONE_VENDOR(0x366c), /* ByoWave controllers */ 581 + XPAD_XBOX360_VENDOR(0x37d7), /* Flydigi Controllers */ 582 582 XPAD_XBOX360_VENDOR(0x413d), /* Black Shark Green Ghost Controller */ 583 583 { } 584 584 };
+4 -1
drivers/input/keyboard/mtk-pmic-keys.c
··· 55 55 const struct mtk_pmic_keys_regs keys_regs[MTK_PMIC_MAX_KEY_COUNT]; 56 56 u32 pmic_rst_reg; 57 57 u32 rst_lprst_mask; /* Long-press reset timeout bitmask */ 58 + bool key_release_irq; 58 59 }; 59 60 60 61 static const struct mtk_pmic_regs mt6397_regs = { ··· 117 116 MTK_PMIC_HOMEKEY_RST), 118 117 .pmic_rst_reg = MT6358_TOP_RST_MISC, 119 118 .rst_lprst_mask = MTK_PMIC_RST_DU_MASK, 119 + .key_release_irq = true, 120 120 }; 121 121 122 122 static const struct mtk_pmic_regs mt6359_regs = { ··· 131 129 MTK_PMIC_HOMEKEY_RST), 132 130 .pmic_rst_reg = MT6359_TOP_RST_MISC, 133 131 .rst_lprst_mask = MTK_PMIC_RST_DU_MASK, 132 + .key_release_irq = true, 134 133 }; 135 134 136 135 struct mtk_pmic_keys_info { ··· 371 368 if (keys->keys[index].irq < 0) 372 369 return keys->keys[index].irq; 373 370 374 - if (of_device_is_compatible(node, "mediatek,mt6358-keys")) { 371 + if (mtk_pmic_regs->key_release_irq) { 375 372 keys->keys[index].irq_r = platform_get_irq_byname(pdev, 376 373 irqnames_r[index]); 377 374
+3
drivers/input/misc/iqs7222.c
··· 2427 2427 if (error) 2428 2428 return error; 2429 2429 2430 + if (!iqs7222->kp_type[chan_index][i]) 2431 + continue; 2432 + 2430 2433 if (!dev_desc->event_offset) 2431 2434 continue; 2432 2435
+14
drivers/input/serio/i8042-acpipnpio.h
··· 1155 1155 .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | 1156 1156 SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) 1157 1157 }, 1158 + { 1159 + .matches = { 1160 + DMI_MATCH(DMI_BOARD_NAME, "XxHP4NAx"), 1161 + }, 1162 + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | 1163 + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) 1164 + }, 1165 + { 1166 + .matches = { 1167 + DMI_MATCH(DMI_BOARD_NAME, "XxKK4NAx_XxSP4NAx"), 1168 + }, 1169 + .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | 1170 + SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) 1171 + }, 1158 1172 /* 1159 1173 * A lot of modern Clevo barebones have touchpad and/or keyboard issues 1160 1174 * after suspend fixable with the forcenorestore quirk.