<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27758">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/cyan: do not hardcode virtual interrupt numbers<br><br>Adapted from chromium commit ee7a150<br>[Strago: do not hardcode virtual interrupt numbers]<br><br>Instead of hardcoding virtual interrupt numbers that may change as<br>the kernel changes, use GpioInt() resources to describe keyboard,<br>touchpad, and touchscreen interrupt lines.<br><br>TEST=Build and boot several cyan variant boards, verify keyboard,<br>touchpad and touchscreen work with newer kernels (4.14+).<br><br>Original-Change-Id: I98d5726f5b8094d639fb40dfca128364f63bb30b<br>Original-Signed-off-by: Dmitry Torokhov <dtor@chromium.org><br>Original-Reviewed-on: https://chromium-review.googlesource.com/894687<br>Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org><br><br>Change-Id: Iecfb45be433249d274532eb746588483fedb3f52<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/mainboard/google/cyan/acpi/touchscreen_elan.asl<br>M src/mainboard/google/cyan/acpi/touchscreen_melfas.asl<br>M src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl<br>M src/mainboard/google/cyan/acpi/trackpad_atmel.asl<br>M src/mainboard/google/cyan/variants/cyan/include/variant/onboard.h<br>M src/mainboard/google/cyan/variants/kefka/include/variant/onboard.h<br>M src/mainboard/google/cyan/variants/reks/include/variant/onboard.h<br>M src/mainboard/google/cyan/variants/relm/include/variant/onboard.h<br>M src/mainboard/google/cyan/variants/setzer/include/variant/onboard.h<br>M src/mainboard/google/cyan/variants/ultima/include/variant/onboard.h<br>M src/mainboard/google/cyan/variants/wizpig/include/variant/onboard.h<br>11 files changed, 8 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/27758/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/cyan/acpi/touchscreen_elan.asl b/src/mainboard/google/cyan/acpi/touchscreen_elan.asl</span><br><span>index 7100120..7e3c7ae 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/touchscreen_elan.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/touchscreen_elan.asl</span><br><span>@@ -35,10 +35,8 @@</span><br><span> AddressingMode7Bit, /* AddressingMode */</span><br><span> "\\_SB.PCI0.I2C1", /* ResourceSource */</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- Interrupt (ResourceConsumer, Level, ActiveLow)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- BOARD_TOUCH_IRQ</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPNC") { BOARD_TOUCH_GPIO_INDEX }</span><br><span> </span><br><span> } )</span><br><span> Return (BUF0)</span><br><span>diff --git a/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl b/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl</span><br><span>index 8d36649..f54f886 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/touchscreen_melfas.asl</span><br><span>@@ -35,10 +35,8 @@</span><br><span> AddressingMode7Bit, /* AddressingMode */</span><br><span> "\\_SB.I2C1", /* ResourceSource */</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- Interrupt (ResourceConsumer, Level, ActiveLow)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- BOARD_TOUCH_IRQ</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPNC") { BOARD_TOUCH_GPIO_INDEX }</span><br><span> })</span><br><span> Return (BUF0)</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl</span><br><span>index 024e6f1..f0db3a3 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl</span><br><span>@@ -78,10 +78,8 @@</span><br><span> AddressingMode7Bit, /* AddressingMode */</span><br><span> "\\_SB.PCI0.I2C1", /* ResourceSource */</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- Interrupt (ResourceConsumer, Edge, ActiveLow)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- BOARD_TOUCH_IRQ</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPNC") { BOARD_TOUCH_GPIO_INDEX }</span><br><span> })</span><br><span> Return (BUF0)</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/cyan/acpi/trackpad_atmel.asl b/src/mainboard/google/cyan/acpi/trackpad_atmel.asl</span><br><span>index da2cf7a..96ec3db 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/trackpad_atmel.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/trackpad_atmel.asl</span><br><span>@@ -33,10 +33,8 @@</span><br><span> AddressingMode7Bit, // AddressingMode</span><br><span> "\\_SB.PCI0.I2C6", // ResourceSource</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- Interrupt (ResourceConsumer, Edge, ActiveLow)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- 183</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ "\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX }</span><br><span> })</span><br><span> </span><br><span> Method (_STA)</span><br><span>diff --git a/src/mainboard/google/cyan/variants/cyan/include/variant/onboard.h b/src/mainboard/google/cyan/variants/cyan/include/variant/onboard.h</span><br><span>index 883f9b9..9d8cd25 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/cyan/include/variant/onboard.h</span><br><span>+++ b/src/mainboard/google/cyan/variants/cyan/include/variant/onboard.h</span><br><span>@@ -30,8 +30,6 @@</span><br><span> * GPSE_SIZE = 86</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define BOARD_TOUCH_IRQ 184</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* KBD: Gpio index in N bank */</span><br><span> #define BOARD_I8042_GPIO_INDEX 17</span><br><span> /* SCI: Gpio index in N bank */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/kefka/include/variant/onboard.h b/src/mainboard/google/cyan/variants/kefka/include/variant/onboard.h</span><br><span>index 4a79806..7702ebe 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/kefka/include/variant/onboard.h</span><br><span>+++ b/src/mainboard/google/cyan/variants/kefka/include/variant/onboard.h</span><br><span>@@ -30,8 +30,6 @@</span><br><span> * GPSE_SIZE = 86</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define BOARD_TOUCH_IRQ 184</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* KBD: Gpio index in N bank */</span><br><span> #define BOARD_I8042_GPIO_INDEX 17</span><br><span> /* Audio: Gpio index in SW bank */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/reks/include/variant/onboard.h b/src/mainboard/google/cyan/variants/reks/include/variant/onboard.h</span><br><span>index 19c3bc3..4ff771c 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/reks/include/variant/onboard.h</span><br><span>+++ b/src/mainboard/google/cyan/variants/reks/include/variant/onboard.h</span><br><span>@@ -30,8 +30,6 @@</span><br><span> * GPSE_SIZE = 86</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define BOARD_TOUCH_IRQ 184</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* DPTF */</span><br><span> #define DPTF_CPU_PASSIVE 80</span><br><span> #define DPTF_CPU_CRITICAL 90</span><br><span>diff --git a/src/mainboard/google/cyan/variants/relm/include/variant/onboard.h b/src/mainboard/google/cyan/variants/relm/include/variant/onboard.h</span><br><span>index 2854ee9..55affff 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/relm/include/variant/onboard.h</span><br><span>+++ b/src/mainboard/google/cyan/variants/relm/include/variant/onboard.h</span><br><span>@@ -30,8 +30,6 @@</span><br><span> * GPSE_SIZE = 86</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define BOARD_TOUCH_IRQ 184</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* KBD: Gpio index in N bank */</span><br><span> #define BOARD_I8042_GPIO_INDEX 17</span><br><span> /* Audio: Gpio index in SW bank */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/setzer/include/variant/onboard.h b/src/mainboard/google/cyan/variants/setzer/include/variant/onboard.h</span><br><span>index 948d9b9..10ec6be 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/setzer/include/variant/onboard.h</span><br><span>+++ b/src/mainboard/google/cyan/variants/setzer/include/variant/onboard.h</span><br><span>@@ -30,8 +30,6 @@</span><br><span> * GPSE_SIZE = 86</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define BOARD_TOUCH_IRQ 184</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* KBD: Gpio index in N bank */</span><br><span> #define BOARD_I8042_GPIO_INDEX 17</span><br><span> /* Audio: Gpio index in SW bank */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/ultima/include/variant/onboard.h b/src/mainboard/google/cyan/variants/ultima/include/variant/onboard.h</span><br><span>index e5b503f4..3b8b5b4 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/ultima/include/variant/onboard.h</span><br><span>+++ b/src/mainboard/google/cyan/variants/ultima/include/variant/onboard.h</span><br><span>@@ -30,8 +30,6 @@</span><br><span> * GPSE_SIZE = 86</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define BOARD_TOUCH_IRQ 184</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* DPTF */</span><br><span> #define DPTF_CPU_PASSIVE 80</span><br><span> #define DPTF_CPU_CRITICAL 90</span><br><span>diff --git a/src/mainboard/google/cyan/variants/wizpig/include/variant/onboard.h b/src/mainboard/google/cyan/variants/wizpig/include/variant/onboard.h</span><br><span>index 5a610e2..4584815 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/wizpig/include/variant/onboard.h</span><br><span>+++ b/src/mainboard/google/cyan/variants/wizpig/include/variant/onboard.h</span><br><span>@@ -30,8 +30,6 @@</span><br><span> * GPSE_SIZE = 86</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define BOARD_TOUCH_IRQ 184</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* KBD: Gpio index in N bank */</span><br><span> #define BOARD_I8042_GPIO_INDEX 17</span><br><span> /* Audio: Gpio index in SW bank */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27758">change 27758</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27758"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Iecfb45be433249d274532eb746588483fedb3f52 </div>
<div style="display:none"> Gerrit-Change-Number: 27758 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>