mirror of
https://github.com/armbian/build.git
synced 2025-08-14 23:26:57 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From 31f08bb2b6dad06c14de910c9a9ee7523b200f99 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megi@xff.cz>
|
|
Date: Sat, 20 May 2023 16:58:49 +0200
|
|
Subject: [PATCH 31/35] Revert "input: goodix: Don't disable regulators during
|
|
suspend"
|
|
|
|
This reverts commit d93d2611a98ccbb75066bd9d508dccc9cf8ad352.
|
|
---
|
|
drivers/input/touchscreen/goodix.c | 14 ++++++++++++++
|
|
1 file changed, 14 insertions(+)
|
|
|
|
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
|
|
index d5d8cf7d95b1..d4b619ebe6ad 100644
|
|
--- a/drivers/input/touchscreen/goodix.c
|
|
+++ b/drivers/input/touchscreen/goodix.c
|
|
@@ -1423,6 +1423,8 @@ static int 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;
|
|
}
|
|
|
|
@@ -1472,6 +1474,18 @@ static int 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.34.1
|
|
|