From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Jan 2022 06:27:55 +0000 (+0200)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v5.19~1384
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b520085ca57982c4beeb9bb64b8f6018425cb61f;p=mirror_ubuntu-kernels.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "Updates to Goodix touchscreen driver (addition of pen support) and
  Silead touchscreen driver (also addition of pen support and parsing of
  embedded firmware to determine screen size), along with assorted fixes
  for other drivers"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ti_am335x_tsc - fix a typo in a comment
  Input: zinitix - add compatible for bt532
  Input: zinitix - handle proper supply names
  dt-bindings: input/ts/zinitix: Convert to YAML, fix and extend
  Input: axp20x-pek - revert "always register interrupt handlers" change
  Input: gpio-keys - avoid clearing twice some memory
  Input: byd - fix typo in a comment
  Input: ucb1400_ts - remove redundant variable penup
  Input: ti_am335x_tsc - lower the X and Y sampling time
  Input: ti_am335x_tsc - fix STEPCONFIG setup for Z2
  Input: ti_am335x_tsc - set ADCREFM for X configuration
  Input: silead - add pen support
  Input: silead - add support for EFI-embedded fw using different min/max coordinates
  Input: goodix - 2 small fixes for pen support
  Input: goodix - improve gpiod_get() error logging
  Input: goodix - add pen support
  Input: ff-core - correct magnitude setting for rumble compatibility
  Input: palmas-pwrbutton - make a couple of arrays static const
  Input: wacom_i2c - clean up the query device fields
  Input: palmas-pwrbutton - use bitfield helpers
---

b520085ca57982c4beeb9bb64b8f6018425cb61f
diff --cc drivers/input/misc/axp20x-pek.c
index e09b1fae42e1,c8f87df93a50..04da7916eb70
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@@ -293,19 -339,7 +323,7 @@@ static int axp20x_pek_probe(struct plat
  
  	axp20x_pek->axp20x = dev_get_drvdata(pdev->dev.parent);
  
- 	axp20x_pek->irq_dbr = platform_get_irq_byname(pdev, "PEK_DBR");
- 	if (axp20x_pek->irq_dbr < 0)
- 		return axp20x_pek->irq_dbr;
- 	axp20x_pek->irq_dbr = regmap_irq_get_virq(
- 			axp20x_pek->axp20x->regmap_irqc, axp20x_pek->irq_dbr);
- 
- 	axp20x_pek->irq_dbf = platform_get_irq_byname(pdev, "PEK_DBF");
- 	if (axp20x_pek->irq_dbf < 0)
- 		return axp20x_pek->irq_dbf;
- 	axp20x_pek->irq_dbf = regmap_irq_get_virq(
- 			axp20x_pek->axp20x->regmap_irqc, axp20x_pek->irq_dbf);
- 
 -	if (axp20x_pek_should_register_input(axp20x_pek, pdev)) {
 +	if (axp20x_pek_should_register_input(axp20x_pek)) {
  		error = axp20x_pek_probe_input_device(axp20x_pek, pdev);
  		if (error)
  			return error;