Merge tag 'v5.16' into next

Sync up with mainline to bring in the latest API changes.

diff --cc drivers/input/misc/axp20x-pek.c
index c8f87df93a50e3dae6673921baf4707daf1eb240,e09b1fae42e10228dda29594c4bcdd588613a98e..04da7916eb70987f96f6873500c105a76d9c8c18
--- 1/drivers/input/misc/axp20x-pek.c
--- 2/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@@ -339,7 -293,19 +323,7 @@@ static int axp20x_pek_probe(struct plat
  
        axp20x_pek->axp20x = dev_get_drvdata(pdev->dev.parent);
  
-       if (axp20x_pek_should_register_input(axp20x_pek, pdev)) {
 -      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)) {
                error = axp20x_pek_probe_input_device(axp20x_pek, pdev);
                if (error)
                        return error;

diff --cc drivers/input/touchscreen/goodix.c
Simple merge

diff --cc drivers/input/touchscreen/goodix.h
Simple merge

diff --cc drivers/input/touchscreen/zinitix.c
Simple merge