88f3771491
- Enable AXP288 PMIC support on x86_64 for battery charging and monitoring support on Bay and Cherry Trail tablets and laptops - Enable various drivers for peripherals found on Bay and Cherry Trail tablets - Add some small patches fixing suspend/resume touchscreen and accelerometer issues on various Bay and Cherry Trail tablets
68 lines
1.8 KiB
Diff
68 lines
1.8 KiB
Diff
From fbac4c05ec1d7c2d949f50baf1e934cbfbb6a494 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 17 Apr 2017 22:06:25 +0200
|
|
Subject: [PATCH 06/16] Input: axp20x-pek - Add wakeup support
|
|
|
|
At least on devices with the AXP288 PMIC the device is expected to
|
|
wakeup from suspend when the power-button gets pressed, add support
|
|
for this.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
drivers/input/misc/axp20x-pek.c | 28 ++++++++++++++++++++++++++++
|
|
1 file changed, 28 insertions(+)
|
|
|
|
diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
|
|
index 400869e61a06..5f16fceaae83 100644
|
|
--- a/drivers/input/misc/axp20x-pek.c
|
|
+++ b/drivers/input/misc/axp20x-pek.c
|
|
@@ -253,6 +253,9 @@ static int axp20x_pek_probe_input_device(struct axp20x_pek *axp20x_pek,
|
|
return error;
|
|
}
|
|
|
|
+ if (axp20x_pek->axp20x->variant == AXP288_ID)
|
|
+ enable_irq_wake(axp20x_pek->irq_dbr);
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
@@ -331,10 +334,35 @@ static int axp20x_pek_probe(struct platform_device *pdev)
|
|
return 0;
|
|
}
|
|
|
|
+static int __maybe_unused axp20x_pek_resume_noirq(struct device *dev)
|
|
+{
|
|
+ struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
|
|
+
|
|
+ if (axp20x_pek->axp20x->variant != AXP288_ID)
|
|
+ return 0;
|
|
+
|
|
+ /*
|
|
+ * Clear interrupts from button presses during suspend, to avoid
|
|
+ * a wakeup power-button press getting reported to userspace.
|
|
+ */
|
|
+ regmap_write(axp20x_pek->axp20x->regmap,
|
|
+ AXP20X_IRQ1_STATE + AXP288_IRQ_POKN / 8,
|
|
+ BIT(AXP288_IRQ_POKN % 8));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+const struct dev_pm_ops axp20x_pek_pm_ops = {
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
+ .resume_noirq = axp20x_pek_resume_noirq,
|
|
+#endif
|
|
+};
|
|
+
|
|
static struct platform_driver axp20x_pek_driver = {
|
|
.probe = axp20x_pek_probe,
|
|
.driver = {
|
|
.name = "axp20x-pek",
|
|
+ .pm = &axp20x_pek_pm_ops,
|
|
},
|
|
};
|
|
module_platform_driver(axp20x_pek_driver);
|
|
--
|
|
2.13.0
|
|
|