<p>shkim has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23010">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy/variants/nautilus: enable digitizer pen device<br><br>- Add pen device property into devicetree.cb.<br>- Add new ACPI device for pen eject event. It will be used by OS.<br><br>BUG=none<br>BRANCH=master<br>TEST=emerge-nautilus coreboot and check pen device operation<br>Signed-off-by: sh.kim <sh_.kim@samsung.com><br><br>Change-Id: I050671c8b46fd92b1dd9164be2646727cd67da9f<br>---<br>M src/mainboard/google/poppy/Kconfig<br>M src/mainboard/google/poppy/dsdt.asl<br>M src/mainboard/google/poppy/variants/nautilus/devicetree.cb<br>M src/mainboard/google/poppy/variants/nautilus/gpio.c<br>A src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/pen_eject.asl<br>M src/mainboard/google/poppy/variants/nautilus/include/variant/gpio.h<br>6 files changed, 61 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/23010/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig</span><br><span>index 9315d96..f0bad35 100644</span><br><span>--- a/src/mainboard/google/poppy/Kconfig</span><br><span>+++ b/src/mainboard/google/poppy/Kconfig</span><br><span>@@ -115,6 +115,11 @@</span><br><span>         select SPI_TPM</span><br><span>       select TPM2</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Select this option to add an ACPI device for pen eject event on the variant.</span><br><span style="color: hsl(120, 100%, 40%);">+config VARIANT_HAS_PEN_EJECT_ACPI</span><br><span style="color: hsl(120, 100%, 40%);">+    bool</span><br><span style="color: hsl(120, 100%, 40%);">+  default n</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config VARIANT_SPECIFIC_OPTIONS_POPPY</span><br><span>         def_bool n</span><br><span>   select DRIVERS_I2C_MAX98927</span><br><span>@@ -137,6 +142,7 @@</span><br><span>    select DRIVERS_I2C_DA7219</span><br><span>    select DRIVERS_PS2_KEYBOARD</span><br><span>  select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA</span><br><span style="color: hsl(120, 100%, 40%);">+     select VARIANT_HAS_PEN_EJECT_ACPI</span><br><span> </span><br><span> config VARIANT_SPECIFIC_OPTIONS_SORAKA</span><br><span>      def_bool n</span><br><span>diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl</span><br><span>index a922d10..2634f31 100644</span><br><span>--- a/src/mainboard/google/poppy/dsdt.asl</span><br><span>+++ b/src/mainboard/google/poppy/dsdt.asl</span><br><span>@@ -73,5 +73,10 @@</span><br><span>     {</span><br><span>            /* Dynamic Platform Thermal Framework */</span><br><span>             #include <variant/acpi/dptf.asl></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_VARIANT_HAS_PEN_EJECT_ACPI)</span><br><span style="color: hsl(120, 100%, 40%);">+           /* Pen eject event */</span><br><span style="color: hsl(120, 100%, 40%);">+         #include <variant/acpi/pen_eject.asl></span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span>  }</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb</span><br><span>index a548ac9..d74588d 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb</span><br><span>+++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb</span><br><span>@@ -308,7 +308,20 @@</span><br><span>                   end</span><br><span>          end # I2C #1</span><br><span>                 device pci 15.2 on end # I2C #2</span><br><span style="color: hsl(0, 100%, 40%);">-         device pci 15.3 on end # I2C #3</span><br><span style="color: hsl(120, 100%, 40%);">+               device pci 15.3 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" = ""ACPI0C50""</span><br><span style="color: hsl(120, 100%, 40%);">+                           register "generic.cid" = ""PNP0C50""</span><br><span style="color: hsl(120, 100%, 40%);">+                            register "generic.desc" = ""Digitizer device""</span><br><span style="color: hsl(120, 100%, 40%);">+                          register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_A22_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+                                register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C9)"</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 "generic.wake" = "GPE0_DW0_21"</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 #3</span><br><span>                 device pci 16.0 on  end # Management Engine Interface 1</span><br><span>              device pci 16.1 off end # Management Engine Interface 2</span><br><span>              device pci 16.2 off end # Management Engine IDE-R</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nautilus/gpio.c b/src/mainboard/google/poppy/variants/nautilus/gpio.c</span><br><span>index ca05ae9..2a76fd1 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nautilus/gpio.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nautilus/gpio.c</span><br><span>@@ -130,7 +130,7 @@</span><br><span>     /* C8  : UART0_RXD ==> NC */</span><br><span>      PAD_CFG_NC(GPP_C8),</span><br><span>  /* C9  : UART0_TXD ==> CHP3_P3.3V_DX_DIG_EN */</span><br><span style="color: hsl(0, 100%, 40%);">-       PAD_CFG_GPO(GPP_C9, 1, DEEP),</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO(GPP_C9, 0, DEEP),</span><br><span>        /* C10 : UART0_RTS# ==> CHP3_CAM_PMIC_RST_L */</span><br><span>    PAD_CFG_GPO(GPP_C10, 1, DEEP),</span><br><span>       /* C11 : UART0_CTS# ==> CHP3_P3.3V_DX_CAM_EN */</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/pen_eject.asl b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/pen_eject.asl</span><br><span>new file mode 100644</span><br><span>index 0000000..ffe2f03</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/pen_eject.asl</span><br><span>@@ -0,0 +1,33 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright 2017 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+Device (PENH)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    Name (_HID, "PRP0001")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    Name (_CRS, ResourceTemplate () {</span><br><span style="color: hsl(120, 100%, 40%);">+             GpioIo (Exclusive, PullNone, 0, 0, IoRestrictionInputOnly,</span><br><span style="color: hsl(120, 100%, 40%);">+            "\\_SB.PCI0.GPIO", 0, ResourceConsumer) { GPIO_DIG_EJECT }</span><br><span style="color: hsl(120, 100%, 40%);">+  })</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  Name (_DSD, Package () {</span><br><span style="color: hsl(120, 100%, 40%);">+              ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),</span><br><span style="color: hsl(120, 100%, 40%);">+             Package () {</span><br><span style="color: hsl(120, 100%, 40%);">+                  Package () {</span><br><span style="color: hsl(120, 100%, 40%);">+                          "compatible",</span><br><span style="color: hsl(120, 100%, 40%);">+                               Package () { "gpio-keys"}</span><br><span style="color: hsl(120, 100%, 40%);">+                   },</span><br><span style="color: hsl(120, 100%, 40%);">+            }</span><br><span style="color: hsl(120, 100%, 40%);">+     })</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/gpio.h b/src/mainboard/google/poppy/variants/nautilus/include/variant/gpio.h</span><br><span>index 4f79495..98f6d6e 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nautilus/include/variant/gpio.h</span><br><span>+++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/gpio.h</span><br><span>@@ -18,4 +18,6 @@</span><br><span> </span><br><span> #include <baseboard/gpio.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define GPIO_DIG_EJECT GPP_B19</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* __MAINBOARD_GPIO_H__ */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23010">change 23010</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/23010"/><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: I050671c8b46fd92b1dd9164be2646727cd67da9f </div>
<div style="display:none"> Gerrit-Change-Number: 23010 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: shkim <sh_.kim@samsung.com> </div>