Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/21122
Change subject: google/cyan: Fix Touchscreen Interrupt ......................................................................
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 jagadish.krishnamoorthy@intel.com Original-Reviewed-by: Duncan Laurie dlaurie@chromium.org
Change-Id: I1c4b029851e321feeedf713186976fbec42dd82e Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M src/mainboard/google/cyan/acpi/mainboard.asl M src/mainboard/google/cyan/onboard.h 2 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/21122/1
diff --git a/src/mainboard/google/cyan/acpi/mainboard.asl b/src/mainboard/google/cyan/acpi/mainboard.asl index 31b9090..9d68065 100644 --- a/src/mainboard/google/cyan/acpi/mainboard.asl +++ b/src/mainboard/google/cyan/acpi/mainboard.asl @@ -46,8 +46,10 @@ 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 @@ 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)) { diff --git a/src/mainboard/google/cyan/onboard.h b/src/mainboard/google/cyan/onboard.h index f03f1df..1347d41 100644 --- a/src/mainboard/google/cyan/onboard.h +++ b/src/mainboard/google/cyan/onboard.h @@ -36,6 +36,8 @@ */ /* ToDO: change kbd irq to gpio bank index */ #define BOARD_I8042_IRQ 182 +#define BOARD_TOUCH_IRQ 184 +#define BOARD_PRE_EVT_TOUCH_IRQ 156
/* SCI: Gpio index in N bank */