@@ -282,11 +282,12 @@ static int axp20x_pek_probe(struct platform_device *pdev)
/*
* On Cherry Trail platforms (hrv == 3), do not register the
- * input device if there is an "INTCFD9" gpio
+ * input device if there is an "INTCFD9" or "ACPI0011" gpio
* button ACPI device, as that handles the power button too,
* and otherwise we end up reporting all presses twice.
*/
- if (hrv == 3 && acpi_dev_found("INTCFD9"))
+ if (hrv == 3 && (acpi_dev_found("INTCFD9") ||
+ acpi_dev_found("ACPI0011")))
register_input_device = false;
}
#endif
The ACPI-6.0 standard defines a standard gpio button device using the ACPI0011 HID replacing the custom PNP0C40 gpio device used on many devices with an AXP288 pmic. All DSDTs I've seen for Cherry Trail devices with an AXP288 pmic define both a PNP0C40 and an ACPI0011 ACPI device, enabling one or the other depending on whether the BIOS thinks it is going to boot Android or Windows. But in the future we may see some Windows only devices only defining the ACPI0011 device, so lets check for both. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/input/misc/axp20x-pek.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)