2 files changed, 31 insertions, 4 deletions

diff --git a/src/drivers/generic/gpio_keys/chip.h b/src/drivers/generic/gpio_keys/chip.h
index 7bc5007df3..a2ff59dc73 100644
--- a/src/drivers/generic/gpio_keys/chip.h
+++ b/src/drivers/generic/gpio_keys/chip.h
@@ -24,6 +24,28 @@ enum {
 	EV_ACT_DEASSERTED,
 };
 
+enum {
+	/*
+	 * GPIO key uses SCI route to wake the system from suspend state. This is typically used
+	 * when the input line is dual routed i.e. one for IRQ and other for SCI or if the GPIO
+	 * controller is capable of handling the filtering for IRQ and SCI separately. This
+	 * requires "wake" property to be provided by the board which represents the GPE # for
+	 * wake. It is exposed as _PRW in ACPI tables.
+	 */
+	WAKEUP_ROUTE_SCI,
+	/*
+	 * GPIO key uses GPIO controller IRQ route for wake. This is used when IRQ and wake are
+	 * routed to the same pad and the GPIO controller is not capable of handling the trigger
+	 * filtering separately for IRQ and wake. Kernel driver for gpio-keys takes care of
+	 * reconfiguring the IRQ trigger as both edges when used in S0 and the edge requested by
+	 * BIOS (as per wakeup_event_action) when entering suspend. In this case, _PRW is not
+	 * exposed for the key device.
+	 */
+	WAKEUP_ROUTE_GPIO_IRQ,
+	/* GPIO key does not support wake. */
+	WAKEUP_ROUTE_DISABLED,
+};
+
 /* Details of the child node defining key */
 struct key_info {
 	/* Device name of the child node - Mandatory */
@@ -37,8 +59,10 @@ struct key_info {
 	uint32_t linux_input_type;
 	/* Descriptive name of the key */
 	const char *label;
-	/* Wake GPE */
-	unsigned int wake;
+	/* Wakeup route (if any) for the key. See WAKEUP_ROUTE_* macros above. */
+	unsigned int wakeup_route;
+	/* Wake GPE -- SCI GPE # for wake. Required for WAKEUP_ROUTE_SCI. */
+	unsigned int wake_gpe;
 	/* Trigger for Wakeup Event Action as defined in EV_ACT_* enum */
 	unsigned int wakeup_event_action;
 	/* Can this key be disabled? */
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index 693fbb54de..f9d71876fa 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -26,9 +26,12 @@ 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->wake) {
+
+	if (key->wakeup_route == WAKEUP_ROUTE_SCI)
+		acpigen_write_PRW(key->wake_gpe, 3);
+
+	if (key->wakeup_route != WAKEUP_ROUTE_DISABLED) {
 		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);
 	}