<p>Jasper Lee would like Jasper Lee to <strong>review</strong> this change.</p><p><a href="https://review.coreboot.org/24991">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy/variants/nami: Add WACOM EMR support<br><br>Add WACOM EMR in devicetree I2C #2, modify GPP_D3 as output high in default.<br><br>BUG=b:72062737<br>BRANCH=master<br>TEST=Verify EMR on nami<br><br>Change-Id: Ib02033a1cba4e04b812655caad146657323b064f<br>Signed-off-by: jasper lee <jasper_lee@compal.corp-partner.google.com><br>---<br>M src/mainboard/google/poppy/variants/nami/devicetree.cb<br>M src/mainboard/google/poppy/variants/nami/gpio.c<br>2 files changed, 19 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/24991/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/variants/nami/devicetree.cb b/src/mainboard/google/poppy/variants/nami/devicetree.cb</span><br><span>index c4aabcf..a09c5ac 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/devicetree.cb</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/devicetree.cb</span><br><span>@@ -261,12 +261,27 @@</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(GPP_E3_IRQ)"</span><br><span style="color: hsl(0, 100%, 40%);">- register "wake" = "GPE0_DW2_16"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E3_IRQ)" </span><br><span style="color: hsl(120, 100%, 40%);">+ register "wake" = "GPE0_DW2_16" </span><br><span> device i2c 15 on end</span><br><span> end</span><br><span> end # I2C #1</span><br><span style="color: hsl(0, 100%, 40%);">- device pci 15.2 on end # I2C #2</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 15.2 on</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/hid</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.hid" = ""WCOM005C""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.desc" = ""WCOM Digitizer""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D1_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.probed" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D3)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.reset_delay_ms" = "20"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D2)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.enable_delay_ms" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.has_power_resource" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "generic.disable_gpio_export_in_crs" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "hid_desc_reg_offset" = "0x1"</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 0x9 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ end # I2C #2</span><br><span> device pci 15.3 on</span><br><span> chip drivers/generic/max98357a</span><br><span> register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A23)"</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c</span><br><span>index e85d948..00b2502 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/gpio.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/gpio.c</span><br><span>@@ -167,7 +167,7 @@</span><br><span> /* D2 : SPI1_MISO ==> PEN_PDCT# */</span><br><span> PAD_CFG_GPI_APIC(GPP_D2, NONE, PLTRST),</span><br><span> /* D3 : SPI1_MOSI ==> PEN_RST# */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_GPO(GPP_D3, 0, DEEP),</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO(GPP_D3, 1, DEEP),</span><br><span> /* D4 : FASHTRIG ==> NC */</span><br><span> PAD_CFG_NC(GPP_D4),</span><br><span> /* D5 : ISH_I2C0_SDA ==> NC */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/24991">change 24991</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/24991"/><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: Ib02033a1cba4e04b812655caad146657323b064f </div>
<div style="display:none"> Gerrit-Change-Number: 24991 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Jasper Lee <jasper_lee@compal.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jasper Lee <jasper_lee@compal.com> </div>