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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:

- a fix for Synaptics touchpads in RMI4 mode failing to suspend/resume
properly because I2C client devices are now being suspended and
resumed asynchronously which changed the ordering

- a change to make sure we do not set right and middle buttons
capabilities on touchpads that are "buttonpads" (i.e. do not have
separate physical buttons)

- a change to zinitix touchscreen driver adding more compatible
strings/IDs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - set up dependency between PS/2 and SMBus companions
Input: zinitix - add new compatible strings
Input: clear BTN_RIGHT/MIDDLE on buttonpads

Linus Torvalds 961af9db 70d2bec7

+28
+6
drivers/input/input.c
··· 2285 2285 /* KEY_RESERVED is not supposed to be transmitted to userspace. */ 2286 2286 __clear_bit(KEY_RESERVED, dev->keybit); 2287 2287 2288 + /* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */ 2289 + if (test_bit(INPUT_PROP_BUTTONPAD, dev->propbit)) { 2290 + __clear_bit(BTN_RIGHT, dev->keybit); 2291 + __clear_bit(BTN_MIDDLE, dev->keybit); 2292 + } 2293 + 2288 2294 /* Make sure that bitmasks not mentioned in dev->evbit are clean. */ 2289 2295 input_cleanse_bitmasks(dev); 2290 2296
+10
drivers/input/mouse/psmouse-smbus.c
··· 75 75 "Marking SMBus companion %s as gone\n", 76 76 dev_name(&smbdev->client->dev)); 77 77 smbdev->dead = true; 78 + device_link_remove(&smbdev->client->dev, 79 + &smbdev->psmouse->ps2dev.serio->dev); 78 80 serio_rescan(smbdev->psmouse->ps2dev.serio); 79 81 } else { 80 82 list_del(&smbdev->node); ··· 176 174 kfree(smbdev); 177 175 } else { 178 176 smbdev->dead = true; 177 + device_link_remove(&smbdev->client->dev, 178 + &psmouse->ps2dev.serio->dev); 179 179 psmouse_dbg(smbdev->psmouse, 180 180 "posting removal request for SMBus companion %s\n", 181 181 dev_name(&smbdev->client->dev)); ··· 274 270 275 271 if (smbdev->client) { 276 272 /* We have our companion device */ 273 + if (!device_link_add(&smbdev->client->dev, 274 + &psmouse->ps2dev.serio->dev, 275 + DL_FLAG_STATELESS)) 276 + psmouse_warn(psmouse, 277 + "failed to set up link with iSMBus companion %s\n", 278 + dev_name(&smbdev->client->dev)); 277 279 return 0; 278 280 } 279 281
+12
drivers/input/touchscreen/zinitix.c
··· 571 571 572 572 #ifdef CONFIG_OF 573 573 static const struct of_device_id zinitix_of_match[] = { 574 + { .compatible = "zinitix,bt402" }, 575 + { .compatible = "zinitix,bt403" }, 576 + { .compatible = "zinitix,bt404" }, 577 + { .compatible = "zinitix,bt412" }, 578 + { .compatible = "zinitix,bt413" }, 579 + { .compatible = "zinitix,bt431" }, 580 + { .compatible = "zinitix,bt432" }, 581 + { .compatible = "zinitix,bt531" }, 574 582 { .compatible = "zinitix,bt532" }, 583 + { .compatible = "zinitix,bt538" }, 575 584 { .compatible = "zinitix,bt541" }, 585 + { .compatible = "zinitix,bt548" }, 586 + { .compatible = "zinitix,bt554" }, 587 + { .compatible = "zinitix,at100" }, 576 588 { } 577 589 }; 578 590 MODULE_DEVICE_TABLE(of, zinitix_of_match);