summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@chromium.org>2019-02-06 10:44:15 -0700
committerPatrick Georgi <pgeorgi@google.com>2019-02-08 10:59:33 +0000
commitd5c458f98ad71f66815f637c5cb6305adc133b27 (patch)
treef90d1bcee02f3800dfcda5aca22fb595c36bec5f /src
parent498f1cc1f3c3c501101c0b052502ec9a04bbd874 (diff)
downloadcoreboot-d5c458f98ad71f66815f637c5cb6305adc133b27.tar.xz
drivers/gpio_keys: Remove redundant is_wakeup_source flag
"is_wakeup_source" flag is used to indicate if the concerned device can trigger a wakeup. This flag is redundant with the "wake" GPE event definition. So remove the redundant flag and use the "wake" GPE event to mark the wakeup source. BUG=None BRANCH=None TEST=Boot to ChromeOS. Ensure that the device is marked as wakeup-source in SSDT if wake GPE is configured. Ensure that the system can suspend and the device acts as a wakeup source Change-Id: I99237323639df1cb72e3a81bcfed869900a2eefa Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com> Reviewed-on: https://review.coreboot.org/c/31258 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/drivers/generic/gpio_keys/chip.h2
-rw-r--r--src/drivers/generic/gpio_keys/gpio_keys.c4
-rw-r--r--src/mainboard/google/octopus/variants/bobba/overridetree.cb1
3 files changed, 1 insertions, 6 deletions
diff --git a/src/drivers/generic/gpio_keys/chip.h b/src/drivers/generic/gpio_keys/chip.h
index 9d33b4f2f3..08acfebf6e 100644
--- a/src/drivers/generic/gpio_keys/chip.h
+++ b/src/drivers/generic/gpio_keys/chip.h
@@ -50,8 +50,6 @@ struct key_info {
uint32_t linux_input_type;
/* Descriptive name of the key */
const char *label;
- /* Can this key wake-up the system? */
- bool is_wakeup_source;
/* Wake GPE */
unsigned int wake;
/* Trigger for Wakeup Event Action as defined in EV_ACT_* enum */
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index f9869d6562..6e18a8a1b0 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -40,10 +40,8 @@ static struct acpi_dp *gpio_keys_add_child_node(
key->linux_input_type);
if (key->label)
acpi_dp_add_string(dsd, "label", key->label);
- if (key->is_wakeup_source)
- acpi_dp_add_integer(dsd, "wakeup-source",
- key->is_wakeup_source);
if (key->wake) {
+ acpi_dp_add_integer(dsd, "wakeup-source", 1);
acpigen_write_PRW(key->wake, 3);
acpi_dp_add_integer(dsd, "wakeup-event-action",
key->wakeup_event_action);
diff --git a/src/mainboard/google/octopus/variants/bobba/overridetree.cb b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
index cd26fabdf2..0230a29a89 100644
--- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
@@ -104,7 +104,6 @@ chip soc/intel/apollolake
register "key.linux_code" = "SW_PEN_INSERTED"
register "key.linux_input_type" = "EV_SW"
register "key.label" = ""pen_eject""
- register "key.is_wakeup_source" = "1"
register "key.wake" = "GPE0_DW2_04"
register "key.wakeup_event_action" = "EV_ACT_DEASSERTED"
device generic 0 on end