mb/google/zork: Use GpioInt wake for touchpad and fingerprint reader
Windows ACPI rejects devices that use both GpioInt in _CRS and a GPE in _PRW (BSOD 0x1000D). Switch touchpad and fingerprint reader to ACPI_GPIO_IRQ_*_WAKE so wake is expressed via GpioInt SharedAndWake instead of a separate _PRW GPE, keeping wake support while staying Windows-compliant. TEST=build/boot Win11 on morphius Change-Id: I2a47b8435fb19ec39d19e09967defa91ae58a85b Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/91790 Reviewed-by: Martin L Roth <gaumless@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
e2c419bc44
commit
fd5b6323ea
10 changed files with 20 additions and 40 deletions
|
|
@ -126,8 +126,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
@ -135,8 +134,7 @@ chip soc/amd/picasso
|
|||
register "generic.hid" = ""SYNA0000""
|
||||
register "generic.cid" = ""ACPI0C50""
|
||||
register "generic.desc" = ""Synaptics Touchpad""
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "generic.wake" = "GEVENT_22"
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "generic.detect" = "1"
|
||||
register "hid_desc_reg_offset" = "0x20"
|
||||
device i2c 2c on end
|
||||
|
|
@ -188,8 +186,7 @@ chip soc/amd/picasso
|
|||
register "desc" = ""Fingerprint Reader""
|
||||
register "hid" = "ACPI_DT_NAMESPACE_HID"
|
||||
register "compat_string" = ""google,cros-ec-uart""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_6)"
|
||||
register "wake" = "GEVENT_10"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_6)"
|
||||
register "uart" = "ACPI_UART_RAW_DEVICE(3000000, 64)"
|
||||
device generic 0 on end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -93,8 +93,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
@ -102,8 +101,7 @@ chip soc/amd/picasso
|
|||
register "generic.hid" = ""SYNA0000""
|
||||
register "generic.cid" = ""ACPI0C50""
|
||||
register "generic.desc" = ""Synaptics Touchpad""
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "generic.wake" = "GEVENT_22"
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "generic.detect" = "1"
|
||||
register "hid_desc_reg_offset" = "0x20"
|
||||
device i2c 2c on end
|
||||
|
|
|
|||
|
|
@ -198,8 +198,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -84,8 +84,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
@ -93,8 +92,7 @@ chip soc/amd/picasso
|
|||
register "generic.hid" = ""SYNA0000""
|
||||
register "generic.cid" = ""ACPI0C50""
|
||||
register "generic.desc" = ""Synaptics Touchpad""
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "generic.wake" = "GEVENT_22"
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "generic.detect" = "1"
|
||||
register "hid_desc_reg_offset" = "0x20"
|
||||
device i2c 2c on end
|
||||
|
|
|
|||
|
|
@ -198,8 +198,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -101,8 +101,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
@ -110,8 +109,7 @@ chip soc/amd/picasso
|
|||
register "generic.hid" = ""SYNA0000""
|
||||
register "generic.cid" = ""ACPI0C50""
|
||||
register "generic.desc" = ""Synaptics Touchpad""
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "generic.wake" = "GEVENT_22"
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "generic.detect" = "1"
|
||||
register "hid_desc_reg_offset" = "0x20"
|
||||
device i2c 2c on end
|
||||
|
|
@ -151,8 +149,7 @@ chip soc/amd/picasso
|
|||
register "desc" = ""Fingerprint Reader""
|
||||
register "hid" = "ACPI_DT_NAMESPACE_HID"
|
||||
register "compat_string" = ""google,cros-ec-uart""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_6)"
|
||||
register "wake" = "GEVENT_10"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_6)"
|
||||
register "uart" = "ACPI_UART_RAW_DEVICE(3000000, 64)"
|
||||
device generic 0 hidden end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -155,8 +155,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on
|
||||
probe TOUCHPAD REGULAR_TOUCHPAD
|
||||
|
|
@ -165,8 +164,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/hid
|
||||
register "generic.hid" = ""ELAN2702""
|
||||
register "generic.desc" = ""ELAN Touchpad""
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "generic.wake" = "GEVENT_22"
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "generic.detect" = "1"
|
||||
register "hid_desc_reg_offset" = "0x01"
|
||||
device i2c 15 on
|
||||
|
|
|
|||
|
|
@ -75,8 +75,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
@ -84,8 +83,7 @@ chip soc/amd/picasso
|
|||
register "generic.hid" = ""SYNA0000""
|
||||
register "generic.cid" = ""ACPI0C50""
|
||||
register "generic.desc" = ""Synaptics Touchpad""
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "generic.wake" = "GEVENT_22"
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "generic.detect" = "1"
|
||||
register "hid_desc_reg_offset" = "0x20"
|
||||
device i2c 2c on end
|
||||
|
|
@ -122,8 +120,7 @@ chip soc/amd/picasso
|
|||
register "desc" = ""Fingerprint Reader""
|
||||
register "hid" = "ACPI_DT_NAMESPACE_HID"
|
||||
register "compat_string" = ""google,cros-ec-uart""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_6)"
|
||||
register "wake" = "GEVENT_10"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_6)"
|
||||
register "uart" = "ACPI_UART_RAW_DEVICE(3000000, 64)"
|
||||
device generic 0 on end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -275,8 +275,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
@ -284,8 +283,7 @@ chip soc/amd/picasso
|
|||
register "generic.hid" = ""SYNA0000""
|
||||
register "generic.cid" = ""ACPI0C50""
|
||||
register "generic.desc" = ""Synaptics Touchpad""
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "generic.wake" = "GEVENT_22"
|
||||
register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "generic.detect" = "1"
|
||||
register "hid_desc_reg_offset" = "0x20"
|
||||
device i2c 2c on end
|
||||
|
|
|
|||
|
|
@ -109,8 +109,7 @@ chip soc/amd/picasso
|
|||
chip drivers/i2c/generic
|
||||
register "hid" = ""ELAN0000""
|
||||
register "desc" = ""ELAN Touchpad""
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_9)"
|
||||
register "wake" = "GEVENT_22"
|
||||
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW_WAKE(GPIO_9)"
|
||||
register "detect" = "1"
|
||||
device i2c 15 on end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue