From 3bfd734e6bcb954149f3500dbd73b506490341ff Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Wed, 14 Mar 2018 15:46:15 +0800 Subject: [PATCH] mb/google/poppy/variants/baseboard: Add gpio-keys ACPI node for PENH This change uses gpio_keys driver to add ACPI node for pen eject event. BUG=b:74413116 TEST=Verified using evtest that pen eject event results in events as expected. Change-Id: I6019d633f4337137bb9fbba770040cb5b30da773 Signed-off-by: Nicolas Boichat Reviewed-on: https://review.coreboot.org/25147 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- .../google/poppy/variants/baseboard/devicetree.cb | 9 +++++++++ src/mainboard/google/poppy/variants/baseboard/gpio.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mainboard/google/poppy/variants/baseboard/devicetree.cb b/src/mainboard/google/poppy/variants/baseboard/devicetree.cb index 1027dda268..074e8a2a4c 100644 --- a/src/mainboard/google/poppy/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/poppy/variants/baseboard/devicetree.cb @@ -318,6 +318,15 @@ chip soc/intel/skylake register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end + chip drivers/generic/gpio_keys + register "name" = ""PENH"" + register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_D8)" + register "key.dev_name" = ""EJCT"" + register "key.linux_code" = "SW_PEN_INSERTED" + register "key.linux_input_type" = "EV_SW" + register "key.label" = ""pen_eject"" + device generic 0 on end + end end # I2C #3 device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 diff --git a/src/mainboard/google/poppy/variants/baseboard/gpio.c b/src/mainboard/google/poppy/variants/baseboard/gpio.c index 1290d18375..daa9004ea8 100644 --- a/src/mainboard/google/poppy/variants/baseboard/gpio.c +++ b/src/mainboard/google/poppy/variants/baseboard/gpio.c @@ -177,7 +177,7 @@ static const struct pad_config gpio_table[] = { /* D7 : ISH_I2C1_SDA ==> NC */ PAD_CFG_NC(GPP_D7), /* D8 : ISH_I2C1_SCL ==> PEN_EJECT_ODL -- for notification */ - PAD_CFG_GPI(GPP_D8, 20K_PU, PLTRST), + PAD_CFG_GPI_GPIO_DRIVER(GPP_D8, 20K_PU, DEEP), /* D9 : ISH_SPI_CS# ==> HP_IRQ_GPIO */ PAD_CFG_GPI_GPIO_DRIVER(GPP_D9, NONE, PLTRST), /* D10 : ISH_SPI_CLK ==> SPKR_RST_L */