From 77c13f03f5291958b933059eeeb99f9c0660552a Mon Sep 17 00:00:00 2001 From: Jagadish Krishnamoorthy Date: Wed, 23 Mar 2016 18:49:42 -0700 Subject: google/cyan: Fix Touchscreen Interrupt Cherry-pick from Chromium commit 1138727. Elan touchscreen driver expects the first gpio resource in asl to be the reset line. The driver considers the gpio based irq line as reset gpio resource and changes the direction to output. This will cause irq registration to fail. Solution is to pass Interrupt resource for touchscreen irq instead of GpioInt. Original-Change-Id: Ia72d4ad80117f3c0014098113c9027416026e65e Original-Signed-off-by: Jagadish Krishnamoorthy Original-Reviewed-by: Duncan Laurie Change-Id: I1c4b029851e321feeedf713186976fbec42dd82e Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/21122 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/cyan/acpi/mainboard.asl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/mainboard/google/cyan/acpi') diff --git a/src/mainboard/google/cyan/acpi/mainboard.asl b/src/mainboard/google/cyan/acpi/mainboard.asl index 31b9090809..9d68065f4c 100644 --- a/src/mainboard/google/cyan/acpi/mainboard.asl +++ b/src/mainboard/google/cyan/acpi/mainboard.asl @@ -46,8 +46,10 @@ Scope (\_SB.PCI0.I2C1) AddressingMode7Bit, /* AddressingMode */ "\\_SB.PCI0.I2C1", /* ResourceSource */ ) - GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,, - "\\_SB.GPSW") { BOARD_TOUCH_GPIO_INDEX } + Interrupt (ResourceConsumer, Edge, ActiveLow) + { + BOARD_PRE_EVT_TOUCH_IRQ + } } ) Name(BUF1,ResourceTemplate () @@ -59,8 +61,10 @@ Scope (\_SB.PCI0.I2C1) AddressingMode7Bit, /* AddressingMode */ "\\_SB.PCI0.I2C1", /* ResourceSource */ ) - GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,, - "\\_SB.GPNC") { BOARD_EVT_TOUCH_GPIO_INDEX } + Interrupt (ResourceConsumer, Edge, ActiveLow) + { + BOARD_TOUCH_IRQ + } } ) If (LEqual (\BDID, BOARD_EVT)) { -- cgit v1.2.3