[coreboot-gerrit] Change in coreboot[master]: mb/google/poppy/variants/nami: Add WACOM EMR support

[Jasper Lee (Code Review)]

Hello Jasper Lee,

I'd like you to do a code review. Please visit

https://review.coreboot.org/24997

to review the following change.

Change subject: mb/google/poppy/variants/nami: Add WACOM EMR support
......................................................................

mb/google/poppy/variants/nami: Add WACOM EMR support

Add WACOM EMR in devicetree I2C #2, modify GPP_D3 as output high in default.

BUG=b:72062737
BRANCH=master
TEST=Verify EMR on nami

Change-Id: Icbe809a48959e5749262aeb1b89b09c4bdafbbc2
Signed-off-by: jasper lee 
---
M src/mainboard/google/poppy/variants/nami/devicetree.cb
M src/mainboard/google/poppy/variants/nami/gpio.c
2 files changed, 17 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/24997/1

diff --git a/src/mainboard/google/poppy/variants/nami/devicetree.cb b/src/mainboard/google/poppy/variants/nami/devicetree.cb
index c4aabcf..603f7ac 100644
--- a/src/mainboard/google/poppy/variants/nami/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nami/devicetree.cb
@@ -266,7 +266,22 @@
    			device i2c 15 on end
    		end
    	end # I2C #1
-		device pci 15.2 on  end # I2C #2
+		device pci 15.2 on
+                        chip drivers/i2c/hid
+                                register "generic.hid" = ""WCOM005C""
+                                register "generic.desc" = ""WCOM Digitizer""
+                                register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D1_IRQ)"
+				register "generic.probed" = "1"
+				register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D3)"
+				register "generic.reset_delay_ms" = "20"
+				register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D2)"
+				register "generic.enable_delay_ms" = "1"
+				register "generic.has_power_resource" = "1"
+				register "generic.disable_gpio_export_in_crs" = "1"
+                                register "hid_desc_reg_offset" = "0x1"
+                                device i2c 0x9 on end
+                        end
+		end # I2C #2
    	device pci 15.3 on
    		chip drivers/generic/max98357a
    			register "sdmode_gpio" =  "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A23)"
diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c
index e85d948..00b2502 100644
--- a/src/mainboard/google/poppy/variants/nami/gpio.c
+++ b/src/mainboard/google/poppy/variants/nami/gpio.c
@@ -167,7 +167,7 @@
    /* D2  : SPI1_MISO ==> PEN_PDCT# */
    PAD_CFG_GPI_APIC(GPP_D2, NONE, PLTRST),
    /* D3  : SPI1_MOSI ==> PEN_RST# */
-	PAD_CFG_GPO(GPP_D3, 0, DEEP),
+	PAD_CFG_GPO(GPP_D3, 1, DEEP),
    /* D4  : FASHTRIG ==> NC */
    PAD_CFG_NC(GPP_D4),
    /* D5  : ISH_I2C0_SDA ==> NC */