From c1122168dec25b72e3d46404fd229641e8d6196b Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 16 Jul 2020 10:00:41 -0600 Subject: [PATCH] mb/google/zork: correct wake gpe value for gpio 9 GPIO_9 is associated with gevent 22. Correct all the misconfigurations and use macros for clarity as to what bit offset is being used instead of open coding things. BUG=b:161205804 Change-Id: Ic4cfd62763d72d12a55f89585f24e07df6af0f4f Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/c/coreboot/+/43516 Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- src/mainboard/google/zork/variants/berknip/overridetree.cb | 4 ++-- src/mainboard/google/zork/variants/dalboz/overridetree.cb | 4 ++-- src/mainboard/google/zork/variants/ezkinil/overridetree.cb | 4 ++-- src/mainboard/google/zork/variants/morphius/overridetree.cb | 4 ++-- src/mainboard/google/zork/variants/trembyle/overridetree.cb | 4 ++-- src/mainboard/google/zork/variants/vilboz/overridetree.cb | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mainboard/google/zork/variants/berknip/overridetree.cb b/src/mainboard/google/zork/variants/berknip/overridetree.cb index b4d4fa42fb..ead39cb8bd 100644 --- a/src/mainboard/google/zork/variants/berknip/overridetree.cb +++ b/src/mainboard/google/zork/variants/berknip/overridetree.cb @@ -47,7 +47,7 @@ chip soc/amd/picasso register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "wake" = "7" + register "wake" = "GEVENT_22" register "probed" = "1" device i2c 15 on end end @@ -55,7 +55,7 @@ chip soc/amd/picasso register "generic.hid" = ""PNP0C50"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "generic.wake" = "7" + register "generic.wake" = "GEVENT_22" register "generic.probed" = "1" register "hid_desc_reg_offset" = "0x20" device i2c 2c on end diff --git a/src/mainboard/google/zork/variants/dalboz/overridetree.cb b/src/mainboard/google/zork/variants/dalboz/overridetree.cb index 16a6e441e4..98a93eda0c 100644 --- a/src/mainboard/google/zork/variants/dalboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/dalboz/overridetree.cb @@ -90,7 +90,7 @@ chip soc/amd/picasso register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "wake" = "7" + register "wake" = "GEVENT_22" register "probed" = "1" device i2c 15 on end end @@ -98,7 +98,7 @@ chip soc/amd/picasso register "generic.hid" = ""PNP0C50"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "generic.wake" = "7" + register "generic.wake" = "GEVENT_22" register "generic.probed" = "1" register "hid_desc_reg_offset" = "0x20" device i2c 2c on end diff --git a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb index abdc39764b..a4cdac6c4b 100644 --- a/src/mainboard/google/zork/variants/ezkinil/overridetree.cb +++ b/src/mainboard/google/zork/variants/ezkinil/overridetree.cb @@ -49,7 +49,7 @@ chip soc/amd/picasso register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "wake" = "7" + register "wake" = "GEVENT_22" register "probed" = "1" device i2c 15 on end end @@ -57,7 +57,7 @@ chip soc/amd/picasso register "generic.hid" = ""PNP0C50"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "generic.wake" = "7" + register "generic.wake" = "GEVENT_22" register "generic.probed" = "1" register "hid_desc_reg_offset" = "0x20" device i2c 2c on end diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb index c0de2ce1ac..eaabd588cf 100644 --- a/src/mainboard/google/zork/variants/morphius/overridetree.cb +++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb @@ -47,7 +47,7 @@ chip soc/amd/picasso register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "wake" = "7" + register "wake" = "GEVENT_22" register "probed" = "1" device i2c 15 on end end @@ -55,7 +55,7 @@ chip soc/amd/picasso register "generic.hid" = ""PNP0C50"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "generic.wake" = "7" + register "generic.wake" = "GEVENT_22" register "generic.probed" = "1" register "hid_desc_reg_offset" = "0x20" device i2c 2c on end diff --git a/src/mainboard/google/zork/variants/trembyle/overridetree.cb b/src/mainboard/google/zork/variants/trembyle/overridetree.cb index d66e518f20..4cd53eea45 100644 --- a/src/mainboard/google/zork/variants/trembyle/overridetree.cb +++ b/src/mainboard/google/zork/variants/trembyle/overridetree.cb @@ -47,7 +47,7 @@ chip soc/amd/picasso register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "wake" = "22" + register "wake" = "GEVENT_22" register "probed" = "1" device i2c 15 on end end @@ -55,7 +55,7 @@ chip soc/amd/picasso register "generic.hid" = ""PNP0C50"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "generic.wake" = "22" + register "generic.wake" = "GEVENT_22" register "generic.probed" = "1" register "hid_desc_reg_offset" = "0x20" device i2c 2c on end diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb index d3e01e2f08..bc1607e5a4 100644 --- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb @@ -80,7 +80,7 @@ chip soc/amd/picasso register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "wake" = "7" + register "wake" = "GEVENT_22" register "probed" = "1" device i2c 15 on end end @@ -88,7 +88,7 @@ chip soc/amd/picasso register "generic.hid" = ""PNP0C50"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_9)" - register "generic.wake" = "7" + register "generic.wake" = "GEVENT_22" register "generic.probed" = "1" register "hid_desc_reg_offset" = "0x20" device i2c 2c on end