<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27760">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/cyan: Mark GpioInt() resources as PullDefault<br><br>Adapted from chromium commit 3750e09<br>[Strago: mark GpioInt() resources as PullDefault]<br><br>coreboot considers GPIO resources first-class citizens and initializes<br>all pads according to their intended use, with necessary pull settings<br>applied. Therefore let's use PullDefault as pull qualifier in AML,<br>letting the kernel know that it shoudl not attempt to alter pull settings<br>when using GPIOs.<br><br>TEST=Built and booted on celes, cyan, and egdar; built for other cyan devices.<br><br>Original-Change-Id: Iff58a324e73a7eeac9b38df05a095fcfe7acd31b<br>Original-Signed-off-by: Dmitry Torokhov <dtor@chromium.org><br>Original-Reviewed-on: https://chromium-review.googlesource.com/898259<br>Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org><br><br>Change-Id: I0c69e77c58b8ceca71bc0c99e16d10c3e539f783<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/mainboard/google/cyan/acpi/codec_maxim.asl<br>M src/mainboard/google/cyan/acpi/codec_realtek.asl<br>M src/mainboard/google/cyan/acpi/mainboard.asl<br>M src/mainboard/google/cyan/acpi/superio.asl<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/acpi/trackpad_elan.asl<br>9 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/27760/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/cyan/acpi/codec_maxim.asl b/src/mainboard/google/cyan/acpi/codec_maxim.asl</span><br><span>index 9abc91e..81bec16 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/codec_maxim.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/codec_maxim.asl</span><br><span>@@ -47,7 +47,7 @@</span><br><span> "\\_SB.PCI0.I2C2", /* ResourceSource: I2C bus controller name */</span><br><span> )</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPSE") { BOARD_JACK_MAXIM_GPIO_INDEX }</span><br><span> } )</span><br><span> Return (SBUF)</span><br><span>@@ -91,7 +91,7 @@</span><br><span> "\\_SB.PCI0.I2C2", /* ResourceSource: I2C bus controller name */</span><br><span> )</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPSW") { BOARD_JACK_TI_GPIO_INDEX }</span><br><span> </span><br><span> } )</span><br><span>@@ -111,7 +111,7 @@</span><br><span> Name (GBUF, ResourceTemplate ()</span><br><span> {</span><br><span> /* Jack Detect (index 0) */</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPSE") { BOARD_JACK_MAXIM_GPIO_INDEX }</span><br><span> })</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/cyan/acpi/codec_realtek.asl b/src/mainboard/google/cyan/acpi/codec_realtek.asl</span><br><span>index d3fa84e..4a1d48d 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/codec_realtek.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/codec_realtek.asl</span><br><span>@@ -39,7 +39,7 @@</span><br><span> )</span><br><span> </span><br><span> /* Jack Detect (index 0) */</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPSW") { JACK_DETECT_GPIO_INDEX }</span><br><span> } )</span><br><span> Return (SBUF)</span><br><span>@@ -57,7 +57,7 @@</span><br><span> Name (GBUF, ResourceTemplate ()</span><br><span> {</span><br><span> /* Jack Detect (index 0) */</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPSW") { JACK_DETECT_GPIO_INDEX }</span><br><span> })</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/cyan/acpi/mainboard.asl b/src/mainboard/google/cyan/acpi/mainboard.asl</span><br><span>index 9f27ac9..af0dc75 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/mainboard.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/mainboard.asl</span><br><span>@@ -23,7 +23,7 @@</span><br><span> {</span><br><span> Name (RBUF, ResourceTemplate ()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPNC") { BOARD_SCI_GPIO_INDEX }</span><br><span> })</span><br><span> Return (RBUF)</span><br><span>diff --git a/src/mainboard/google/cyan/acpi/superio.asl b/src/mainboard/google/cyan/acpi/superio.asl</span><br><span>index ca973d0..b3961c0 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/superio.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/superio.asl</span><br><span>@@ -23,7 +23,7 @@</span><br><span> #define SIO_EC_ENABLE_PS2K /* Enable PS/2 Keyboard */</span><br><span> </span><br><span> /* Override default IRQ settings */</span><br><span style="color: hsl(0, 100%, 40%);">-#define SIO_EC_PS2K_IRQ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,\</span><br><span style="color: hsl(120, 100%, 40%);">+#define SIO_EC_PS2K_IRQ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault,,\</span><br><span> "\\_SB.GPNC") { BOARD_I8042_GPIO_INDEX }</span><br><span> </span><br><span> /* ACPI code for EC SuperIO functions */</span><br><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 7e3c7ae..cd67a0e 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,7 +35,7 @@</span><br><span> AddressingMode7Bit, /* AddressingMode */</span><br><span> "\\_SB.PCI0.I2C1", /* ResourceSource */</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPNC") { BOARD_TOUCH_GPIO_INDEX }</span><br><span> </span><br><span> } )</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 f54f886..905b7b8 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,7 +35,7 @@</span><br><span> AddressingMode7Bit, /* AddressingMode */</span><br><span> "\\_SB.I2C1", /* ResourceSource */</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPNC") { BOARD_TOUCH_GPIO_INDEX }</span><br><span> })</span><br><span> Return (BUF0)</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 f0db3a3..1b10848 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,7 +78,7 @@</span><br><span> AddressingMode7Bit, /* AddressingMode */</span><br><span> "\\_SB.PCI0.I2C1", /* ResourceSource */</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPNC") { BOARD_TOUCH_GPIO_INDEX }</span><br><span> })</span><br><span> Return (BUF0)</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 96f3185..9e63d12 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,7 +33,7 @@</span><br><span> AddressingMode7Bit, // AddressingMode</span><br><span> "\\_SB.PCI0.I2C6", // ResourceSource</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX }</span><br><span> })</span><br><span> </span><br><span>diff --git a/src/mainboard/google/cyan/acpi/trackpad_elan.asl b/src/mainboard/google/cyan/acpi/trackpad_elan.asl</span><br><span>index f89e1bc..4a80c19 100644</span><br><span>--- a/src/mainboard/google/cyan/acpi/trackpad_elan.asl</span><br><span>+++ b/src/mainboard/google/cyan/acpi/trackpad_elan.asl</span><br><span>@@ -32,7 +32,7 @@</span><br><span> AddressingMode7Bit, /* AddressingMode */</span><br><span> "\\_SB.PCI0.I2C6", /* ResourceSource */</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,</span><br><span style="color: hsl(120, 100%, 40%);">+ GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault,,</span><br><span> "\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX }</span><br><span> })</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27760">change 27760</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/27760"/><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: I0c69e77c58b8ceca71bc0c99e16d10c3e539f783 </div>
<div style="display:none"> Gerrit-Change-Number: 27760 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>