[coreboot-gerrit] New patch to review for coreboot: ec/lenovo/pmh7: dont set trackpad + trackpoint when boot from s3
Alexander Couzens (lynxis@fe80.eu)
gerrit at coreboot.org
Sun Aug 14 23:21:17 CEST 2016
Alexander Couzens (lynxis at fe80.eu) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16216
-gerrit
commit 9ad391aa735410eb10e0978847f16f1701839cf1
Author: Alexander Couzens <lynxis at fe80.eu>
Date: Sun Aug 14 23:19:54 2016 +0200
ec/lenovo/pmh7: dont set trackpad + trackpoint when boot from s3
Change-Id: Iee5781048ac44a1acb78e843764df162b47a7878
Signed-off-by: Alexander Couzens <lynxis at fe80.eu>
---
src/ec/lenovo/pmh7/pmh7.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
index b2c3c08..59f47b4 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <arch/acpi.h>
#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
@@ -114,13 +115,15 @@ static void enable_dev(struct device *dev)
pmh7_backlight_enable(conf->backlight_enable);
pmh7_dock_event_enable(conf->dock_event_enable);
- if (get_option(&val, "touchpad") != CB_SUCCESS)
- val = 1;
- pmh7_touchpad_enable(val);
+ if (!acpi_is_wakeup_s3()) {
+ if (get_option(&val, "touchpad") != CB_SUCCESS)
+ val = 1;
+ pmh7_touchpad_enable(val);
- if (get_option(&val, "trackpoint") != CB_SUCCESS)
- val = 1;
- pmh7_trackpoint_enable(val);
+ if (get_option(&val, "trackpoint") != CB_SUCCESS)
+ val = 1;
+ pmh7_trackpoint_enable(val);
+ }
}
struct chip_operations ec_lenovo_pmh7_ops = {
More information about the coreboot-gerrit
mailing list