<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30236">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/cyan: set touchscreen GPIO to non_maskable<br><br>Commit 73b723d [google/cyan: Switch Touchpad and Touchscreen...]<br>in additon to changing the touchpad/touchscreen interrupts from<br>edge to level triggered, also marked them as maskable. This not only<br>broke the touchpad functionality, but caused issues with the touchpad<br>as well. Revert the touchpad to being non_maskable for all cyan<br>variants with a touchscreen.<br><br>Test: boot GalliumOS on google/cyan with a range of kernel versions<br>(4.15.18, 4.16.13, 4.17.x, 4.18.x) and verify touchscreen functional,<br>touchpad working properly (not jittery)<br><br>Change-Id: I0e0357912f9404af7d0f4e7938a1a94c74810b37<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/mainboard/google/cyan/variants/banon/gpio.c<br>M src/mainboard/google/cyan/variants/celes/gpio.c<br>M src/mainboard/google/cyan/variants/cyan/gpio.c<br>M src/mainboard/google/cyan/variants/kefka/gpio.c<br>M src/mainboard/google/cyan/variants/reks/gpio.c<br>M src/mainboard/google/cyan/variants/relm/gpio.c<br>M src/mainboard/google/cyan/variants/setzer/gpio.c<br>M src/mainboard/google/cyan/variants/ultima/gpio.c<br>M src/mainboard/google/cyan/variants/wizpig/gpio.c<br>9 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/30236/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/cyan/variants/banon/gpio.c b/src/mainboard/google/cyan/variants/banon/gpio.c</span><br><span>index f9e4e3e..6983d91 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/banon/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/banon/gpio.c</span><br><span>@@ -163,7 +163,7 @@</span><br><span> /* 17 GPIO_SUS3 */</span><br><span> GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 19 GPIO_SUS1 */</span><br><span> GPIO_NC, /* 20 GPIO_SUS5 */</span><br><span> GPIO_NC, /* 21 SEC_GPIO_SUS11 */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/celes/gpio.c b/src/mainboard/google/cyan/variants/celes/gpio.c</span><br><span>index b4d8b1e..c416053 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/celes/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/celes/gpio.c</span><br><span>@@ -164,7 +164,7 @@</span><br><span> GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */</span><br><span> GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),</span><br><span> /* 17 GPIO_SUS3 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span> GPIO_NC,</span><br><span> /* 19 GPIO_SUS1 */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/cyan/gpio.c b/src/mainboard/google/cyan/variants/cyan/gpio.c</span><br><span>index 4cdfcdf..c26e7b6 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/cyan/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/cyan/gpio.c</span><br><span>@@ -166,7 +166,7 @@</span><br><span> /* 17 GPIO_SUS3 */</span><br><span> GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L3, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 19 GPIO_SUS1 */</span><br><span> GPIO_NC, /* 20 GPIO_SUS5 */</span><br><span> GPIO_NC, /* 21 SEC_GPIO_SUS11 */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/kefka/gpio.c b/src/mainboard/google/cyan/variants/kefka/gpio.c</span><br><span>index d628658..0ef2842 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/kefka/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/kefka/gpio.c</span><br><span>@@ -163,7 +163,7 @@</span><br><span> /* 17 GPIO_SUS3 */</span><br><span> GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 19 GPIO_SUS1 */</span><br><span> GPIO_NC, /* 20 GPIO_SUS5 */</span><br><span> GPIO_NC, /* 21 SEC_GPIO_SUS11 */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/reks/gpio.c b/src/mainboard/google/cyan/variants/reks/gpio.c</span><br><span>index 7b9b5af..e0d82cf 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/reks/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/reks/gpio.c</span><br><span>@@ -165,7 +165,7 @@</span><br><span> /* 17 GPIO_SUS3 */</span><br><span> GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 19 GPIO_SUS1 */</span><br><span> GPIO_NC, /* 20 GPIO_SUS5 */</span><br><span> GPIO_NC, /* 21 SEC_GPIO_SUS11 */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/relm/gpio.c b/src/mainboard/google/cyan/variants/relm/gpio.c</span><br><span>index 95c1300..9cb80e6 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/relm/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/relm/gpio.c</span><br><span>@@ -166,7 +166,7 @@</span><br><span> /* 17 GPIO_SUS3 */</span><br><span> GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 19 GPIO_SUS1 */</span><br><span> GPIO_NC, /* 20 GPIO_SUS5 */</span><br><span> GPIO_NC, /* 21 SEC_GPIO_SUS11 */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/setzer/gpio.c b/src/mainboard/google/cyan/variants/setzer/gpio.c</span><br><span>index 1307f7d..83f742e 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/setzer/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/setzer/gpio.c</span><br><span>@@ -164,7 +164,7 @@</span><br><span> /* 17 GPIO_SUS3 */</span><br><span> GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 19 GPIO_SUS1 */</span><br><span> GPIO_NC, /* 20 GPIO_SUS5 */</span><br><span> GPIO_NC, /* 21 SEC_GPIO_SUS11 */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/ultima/gpio.c b/src/mainboard/google/cyan/variants/ultima/gpio.c</span><br><span>index 43f1099..fe8c934 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/ultima/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/ultima/gpio.c</span><br><span>@@ -165,7 +165,7 @@</span><br><span> /* 17 GPIO_SUS3 */</span><br><span> GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 19 GPIO_SUS1 */</span><br><span> GPIO_NC, /* 20 GPIO_SUS5 */</span><br><span> GPIO_NC, /* 21 SEC_GPIO_SUS11 */</span><br><span>diff --git a/src/mainboard/google/cyan/variants/wizpig/gpio.c b/src/mainboard/google/cyan/variants/wizpig/gpio.c</span><br><span>index 3d3b273..affe893 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/wizpig/gpio.c</span><br><span>+++ b/src/mainboard/google/cyan/variants/wizpig/gpio.c</span><br><span>@@ -164,7 +164,7 @@</span><br><span> /* 17 GPIO_SUS3 */</span><br><span> GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span> /* 18 GPIO_SUS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPI(trig_level_low, L1, P_1K_H, 0, NA, UNMASK_WAKE, NA),</span><br><span style="color: hsl(120, 100%, 40%);">+ GPI(trig_level_low, L1, P_1K_H, non_maskable, NA, UNMASK_WAKE, NA),</span><br><span> /* 19 GPIO_SUS1 */</span><br><span> GPIO_NC, /* 20 GPIO_SUS5 */</span><br><span> GPIO_INPUT_NO_PULL, /* 21 SEC_GPIO_SUS11 */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30236">change 30236</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/c/coreboot/+/30236"/><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-Change-Id: I0e0357912f9404af7d0f4e7938a1a94c74810b37 </div>
<div style="display:none"> Gerrit-Change-Number: 30236 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>