55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
|
From bf72e3dfbc1e8e207a220447a2f33095e6ffaefb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ondrej Jirman <megous@megous.com>
|
||
|
|
Date: Sat, 1 May 2021 01:28:07 +0200
|
||
|
|
Subject: [PATCH 187/478] input: goodix: Don't disable regulators during
|
||
|
|
suspend
|
||
|
|
|
||
|
|
It does no harm to disable them, but on Pinephone we have other
|
||
|
|
peripherals attached to the same power supplies, whose drivers
|
||
|
|
will not reference the regulator, so powering down the regulators
|
||
|
|
from Goodix driver will break those other devices.
|
||
|
|
|
||
|
|
Until those drivers gain the regulator support, don't disable
|
||
|
|
the regulators in Goodix driver.
|
||
|
|
|
||
|
|
Signed-off-by: Ondrej Jirman <megous@megous.com>
|
||
|
|
---
|
||
|
|
drivers/input/touchscreen/goodix.c | 14 --------------
|
||
|
|
1 file changed, 14 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
|
||
|
|
index da742e8495cf..5e9150eacc59 100644
|
||
|
|
--- a/drivers/input/touchscreen/goodix.c
|
||
|
|
+++ b/drivers/input/touchscreen/goodix.c
|
||
|
|
@@ -1302,8 +1302,6 @@ static int __maybe_unused goodix_suspend(struct device *dev)
|
||
|
|
goodix_free_irq(ts);
|
||
|
|
goodix_irq_direction_output(ts, 0);
|
||
|
|
gpiod_direction_output(ts->gpiod_rst, 0);
|
||
|
|
- regulator_disable(ts->avdd28);
|
||
|
|
- regulator_disable(ts->vddio);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -1351,18 +1349,6 @@ static int __maybe_unused goodix_resume(struct device *dev)
|
||
|
|
int error;
|
||
|
|
|
||
|
|
if (ts->poweroff_in_suspend) {
|
||
|
|
- error = regulator_enable(ts->avdd28);
|
||
|
|
- if (error) {
|
||
|
|
- dev_err(dev, "Regulator avdd28 enable failed.\n");
|
||
|
|
- return error;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- error = regulator_enable(ts->vddio);
|
||
|
|
- if (error) {
|
||
|
|
- dev_err(dev, "Regulator vddio enable failed.\n");
|
||
|
|
- return error;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
error = goodix_reset(ts);
|
||
|
|
if (error) {
|
||
|
|
dev_err(dev, "Controller reset failed.\n");
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|