GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/poppy/variants/nami: Invert polarity of EMR_GARAGE_DET# 

This gpio should be active low, but is not currently configured that way.
Changing gpio configuration to reflect that.

BUG=b:73121017, b:77941823
BRANCH=None
TEST=iotools mmio_read32 0xfdae0588 (GPP_E1) Make sure that when pen
     is ejected, gpio is low and when pen is inserted, gpio is high.
     Also tested that wake upon pen eject is working.

Change-Id: Ic49eea6412c3378dca39a3338b43df12bc27037d
Signed-off-by: Shelley Chen <shchen@google.com>
Reviewed-on: https://review.coreboot.org/26017
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Shelley Chen 2018-05-02 15:49:41 -07:00
parent 9740bcb0cf
commit 5430d013bf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/google/poppy/variants/nami/devicetree.cb
View File

@ -301,11 +301,11 @@ chip soc/intel/skylake
end end
chip drivers/generic/gpio_keys chip drivers/generic/gpio_keys
register "name" = ""PENH"" register "name" = ""PENH""
register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_E8)" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_HIGH(GPP_E8)"
register "key.dev_name" = ""EJCT"" register "key.dev_name" = ""INST""
register "key.linux_code" = "SW_PEN_INSERTED" register "key.linux_code" = "SW_PEN_INSERTED"
register "key.linux_input_type" = "EV_SW" register "key.linux_input_type" = "EV_SW"
register "key.label" = ""pen_eject"" register "key.label" = ""pen_insert""
device generic 0 on end device generic 0 on end
end end
end # I2C #2 end # I2C #2

6
src/mainboard/google/poppy/variants/nami/gpio.c
View File

@ -210,8 +210,8 @@ static const struct pad_config gpio_table[] = {
/* E0 : SATAXPCI0 ==> H1_PCH_INT_ODL */ /* E0 : SATAXPCI0 ==> H1_PCH_INT_ODL */
PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST), PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST),
/* E1 : SATAXPCIE1 ==> PEN_EJECT_ODL - for wake event */ /* E1 : SATAXPCIE1 ==> EMR_GARAGE_DET# - for wake event */
PAD_CFG_GPI_ACPI_SCI(GPP_E1, NONE, DEEP, NONE), PAD_CFG_GPI_ACPI_SCI(GPP_E1, NONE, DEEP, INVERT),
/* E2 : SATAXPCIE2 ==> WLAN_OFF# */ /* E2 : SATAXPCIE2 ==> WLAN_OFF# */
PAD_CFG_GPO(GPP_E2, 1, DEEP), PAD_CFG_GPO(GPP_E2, 1, DEEP),
/* E3 : CPU_GP0 ==> TRACKPAD_INT# */ /* E3 : CPU_GP0 ==> TRACKPAD_INT# */
@ -224,7 +224,7 @@ static const struct pad_config gpio_table[] = {
PAD_CFG_NC(GPP_E6), PAD_CFG_NC(GPP_E6),
/* E7 : CPU_GP1 ==> TOUCHSCREEN_INT# */ /* E7 : CPU_GP1 ==> TOUCHSCREEN_INT# */
PAD_CFG_GPI_APIC(GPP_E7, NONE, PLTRST), PAD_CFG_GPI_APIC(GPP_E7, NONE, PLTRST),
/* E8 : SATALED# ==> PEN_EJECT_ODL - for notification */ /* E8 : SATALED# ==> EMR_GARAGE_DET# - for notification */
PAD_CFG_GPI_GPIO_DRIVER(GPP_E8, NONE, DEEP), PAD_CFG_GPI_GPIO_DRIVER(GPP_E8, NONE, DEEP),
/* E9 : USB2_OCO# ==> USB_C0_OC# */ /* E9 : USB2_OCO# ==> USB_C0_OC# */
PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1), PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1),