<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29189">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/octopus: Use a single GPIO for trackpad wake and IRQ<br><br>This change uses the newly added macros for configuring the same GPI<br>pad(GPIO_135) for IRQ (normal interrupt operations) and<br>wake (interrupt for waking from S3/S0ix) for the trackpad device. The<br>other pad GPIO_142 is now configured as not connected.<br><br>BUG=b:117553222<br>TEST=Verified that yorp and bobba wake from S3 and S0ix using<br>trackpad.<br><br>Change-Id: I2b704f1be493141629c647b79723b0025b0f7dd6<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M src/mainboard/google/octopus/variants/ampton/overridetree.cb<br>M src/mainboard/google/octopus/variants/baseboard/gpio.c<br>M src/mainboard/google/octopus/variants/bip/overridetree.cb<br>M src/mainboard/google/octopus/variants/bobba/overridetree.cb<br>M src/mainboard/google/octopus/variants/fleex/overridetree.cb<br>M src/mainboard/google/octopus/variants/meep/overridetree.cb<br>M src/mainboard/google/octopus/variants/phaser/overridetree.cb<br>M src/mainboard/google/octopus/variants/yorp/overridetree.cb<br>8 files changed, 18 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/29189/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/octopus/variants/ampton/overridetree.cb b/src/mainboard/google/octopus/variants/ampton/overridetree.cb</span><br><span>index cd0ea18..b93a5e5 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/ampton/overridetree.cb</span><br><span>+++ b/src/mainboard/google/octopus/variants/ampton/overridetree.cb</span><br><span>@@ -31,8 +31,8 @@</span><br><span> chip drivers/i2c/generic</span><br><span> register "hid" = ""ELAN0000""</span><br><span> register "desc" = ""ELAN Touchpad""</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW3_27"</span><br><span> register "probed" = "1"</span><br><span> device i2c 15 on end</span><br><span> end</span><br><span>diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>index 82d3f7c..8af11bf 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>+++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>@@ -196,7 +196,7 @@</span><br><span> PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_133, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* HV_EDP_HPD */</span><br><span> </span><br><span> PAD_NC(GPIO_134, NONE),/* GPIO_134 -- unused */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_GPI_APIC_IOS(GPIO_135, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD),/* GPIO_135 -- TRACKPAD_INT1_1V8_ODL */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPI_IRQ_WAKE(GPIO_135, NONE, DEEP, LEVEL, INVERT),/* GPIO_135 -- TRACKPAD_INT1_1V8_ODL */</span><br><span> PAD_CFG_GPI_APIC_IOS(GPIO_136, NONE, DEEP, LEVEL, INVERT, TxDRxE, DISPUPD),/* GPIO_136 -- PMIC_PCH_INT_ODL */</span><br><span> PAD_CFG_GPI_APIC_IOS(GPIO_137, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD),/* GPIO_137 -- HP_INT_ODL */</span><br><span> PAD_CFG_GPI_APIC_IOS(GPIO_138, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD),/* GPIO_138 -- PEN_PDCT_ODL */</span><br><span>@@ -204,7 +204,7 @@</span><br><span> PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_140, 1, DEEP, NONE, Tx1RxDCRx0, DISPUPD),/* GPIO_140 -- PEN_RESET */</span><br><span> // Also we may be able to use eSPI WAKE# Virtual Wire instead</span><br><span> PAD_CFG_GPI_SCI_IOS(GPIO_141, NONE, DEEP, EDGE_SINGLE, INVERT, IGNORE, DISPUPD),/* GPIO_141 -- EC_PCH_WAKE_ODL */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_GPI_SCI_LOW(GPIO_142, NONE, DEEP, LEVEL),/* GPIO_142 -- TRACKPAD_INT2_1V8_ODL */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_NC(GPIO_142, UP_20K),/* GPIO_142 -- TRACKPAD_INT2_1V8_ODL(unused) */</span><br><span> PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_143, 1, DEEP, UP_20K, HIZCRx1, ENPU),/* GPIO_143 -- LTE_SAR_ODL */</span><br><span> PAD_CFG_GPI_SCI_LOW(GPIO_144, NONE, DEEP, LEVEL),/* GPIO_144 -- PEN_EJECT_ODL(wake) */</span><br><span> PAD_CFG_GPI_GPIO_DRIVER(GPIO_145, NONE, DEEP),/* GPIO_145 -- PEN_EJECT_ODL(notifications) */</span><br><span>diff --git a/src/mainboard/google/octopus/variants/bip/overridetree.cb b/src/mainboard/google/octopus/variants/bip/overridetree.cb</span><br><span>index e79a159..1403ac6 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/bip/overridetree.cb</span><br><span>+++ b/src/mainboard/google/octopus/variants/bip/overridetree.cb</span><br><span>@@ -31,8 +31,8 @@</span><br><span> chip drivers/i2c/generic</span><br><span> register "hid" = ""ELAN0000""</span><br><span> register "desc" = ""ELAN Touchpad""</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW3_27"</span><br><span> register "probed" = "1"</span><br><span> device i2c 15 on end</span><br><span> end</span><br><span>diff --git a/src/mainboard/google/octopus/variants/bobba/overridetree.cb b/src/mainboard/google/octopus/variants/bobba/overridetree.cb</span><br><span>index 662a3025..6ba69ff 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb</span><br><span>+++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb</span><br><span>@@ -76,16 +76,16 @@</span><br><span> chip drivers/i2c/generic</span><br><span> register "hid" = ""ELAN0000""</span><br><span> register "desc" = ""ELAN Touchpad""</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW3_27"</span><br><span> register "probed" = "1"</span><br><span> device i2c 15 on end</span><br><span> end</span><br><span> chip drivers/i2c/hid</span><br><span> register "generic.hid" = ""PNP0C50""</span><br><span> register "generic.desc" = ""Synaptics Touchpad""</span><br><span style="color: hsl(0, 100%, 40%);">- register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "generic.wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.wake" = "GPE0_DW3_27"</span><br><span> register "generic.probed" = "1"</span><br><span> register "hid_desc_reg_offset" = "0x20"</span><br><span> device i2c 0x2c on end</span><br><span>diff --git a/src/mainboard/google/octopus/variants/fleex/overridetree.cb b/src/mainboard/google/octopus/variants/fleex/overridetree.cb</span><br><span>index c431e04..b557b62 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/fleex/overridetree.cb</span><br><span>+++ b/src/mainboard/google/octopus/variants/fleex/overridetree.cb</span><br><span>@@ -62,8 +62,8 @@</span><br><span> chip drivers/i2c/generic</span><br><span> register "hid" = ""ELAN0000""</span><br><span> register "desc" = ""ELAN Touchpad""</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW3_27"</span><br><span> register "probed" = "1"</span><br><span> device i2c 15 on end</span><br><span> end</span><br><span>diff --git a/src/mainboard/google/octopus/variants/meep/overridetree.cb b/src/mainboard/google/octopus/variants/meep/overridetree.cb</span><br><span>index 691fa9e..0b438d6 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/meep/overridetree.cb</span><br><span>+++ b/src/mainboard/google/octopus/variants/meep/overridetree.cb</span><br><span>@@ -76,8 +76,8 @@</span><br><span> chip drivers/i2c/generic</span><br><span> register "hid" = ""ELAN0000""</span><br><span> register "desc" = ""ELAN Touchpad""</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW3_27"</span><br><span> register "probed" = "1"</span><br><span> device i2c 15 on end</span><br><span> end</span><br><span>diff --git a/src/mainboard/google/octopus/variants/phaser/overridetree.cb b/src/mainboard/google/octopus/variants/phaser/overridetree.cb</span><br><span>index 3a208ea..cd92dcb 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/phaser/overridetree.cb</span><br><span>+++ b/src/mainboard/google/octopus/variants/phaser/overridetree.cb</span><br><span>@@ -76,8 +76,8 @@</span><br><span> chip drivers/i2c/generic</span><br><span> register "hid" = ""ELAN0000""</span><br><span> register "desc" = ""ELAN Touchpad""</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW3_27"</span><br><span> register "probed" = "1"</span><br><span> device i2c 15 on end</span><br><span> end</span><br><span>diff --git a/src/mainboard/google/octopus/variants/yorp/overridetree.cb b/src/mainboard/google/octopus/variants/yorp/overridetree.cb</span><br><span>index d29e6c1..de711ba 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/yorp/overridetree.cb</span><br><span>+++ b/src/mainboard/google/octopus/variants/yorp/overridetree.cb</span><br><span>@@ -35,8 +35,8 @@</span><br><span> chip drivers/i2c/generic</span><br><span> register "hid" = ""ELAN0000""</span><br><span> register "desc" = ""ELAN Touchpad""</span><br><span style="color: hsl(0, 100%, 40%);">- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "wake" = "GPE0_DW2_02"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_135_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW3_27"</span><br><span> register "probed" = "1"</span><br><span> device i2c 15 on end</span><br><span> end</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29189">change 29189</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/29189"/><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: I2b704f1be493141629c647b79723b0025b0f7dd6 </div>
<div style="display:none"> Gerrit-Change-Number: 29189 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>