diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/generic/gpio_keys/chip.h | 2 | ||||
| -rw-r--r-- | src/drivers/generic/gpio_keys/gpio_keys.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/octopus/variants/bobba/overridetree.cb | 1 |
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 |