mb/google/hatch: Kohaku: Re-setup dual-routing of EMR_GARAGE_DET

The pinctrl driver in the linux kernel automatically turns off SCI
routing for all GPIOs exported via ACPI, so this patch sets up
dual-routing of the EMR_GARAGE_DET signal so that one can be used
for IRQs and one for the SCI wake.

Change-Id: Iadeb4502c5a98a72ba651bdcad626609656c196f
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34780
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Shelley Chen <shchen@google.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Tim Wawrzynczak 2019-08-07 11:38:31 -06:00 committed by Patrick Georgi
parent 69254494a0
commit 73ee930a53
3 changed files with 5 additions and 2 deletions

View File

@ -30,7 +30,7 @@ static const struct pad_config gpio_table[] = {
PAD_CFG_GPI_INT(GPP_A6, NONE, PLTRST, LEVEL), PAD_CFG_GPI_INT(GPP_A6, NONE, PLTRST, LEVEL),
/* A7 : PP3300_SOC_A */ /* A7 : PP3300_SOC_A */
PAD_NC(GPP_A7, NONE), PAD_NC(GPP_A7, NONE),
/* A8 : PEN_GARAGE_DET_L */ /* A8 : PEN_GARAGE_DET_L (wake) */
PAD_CFG_GPI_GPIO_DRIVER_SCI(GPP_A8, NONE, DEEP, LEVEL, NONE), PAD_CFG_GPI_GPIO_DRIVER_SCI(GPP_A8, NONE, DEEP, LEVEL, NONE),
/* A9 : ESPI_CLK */ /* A9 : ESPI_CLK */
/* A10 : FPMCU_PCH_BOOT1 */ /* A10 : FPMCU_PCH_BOOT1 */

View File

@ -25,6 +25,8 @@ static const struct pad_config gpio_table[] = {
PAD_NC(GPP_A6, NONE), PAD_NC(GPP_A6, NONE),
/* A10 : PEN_RESET_ODL */ /* A10 : PEN_RESET_ODL */
PAD_CFG_GPO(GPP_A10, 1, DEEP), PAD_CFG_GPO(GPP_A10, 1, DEEP),
/* A16 : EMR_GARAGE_DET (notification) */
PAD_CFG_GPI_APIC(GPP_A16, NONE, PLTRST, LEVEL, NONE),
/* A17 : PIRQA# ==> NC */ /* A17 : PIRQA# ==> NC */
PAD_NC(GPP_A17, NONE), PAD_NC(GPP_A17, NONE),
/* A18 : ISH_GP0 ==> NC */ /* A18 : ISH_GP0 ==> NC */

View File

@ -112,7 +112,8 @@ chip soc/intel/cannonlake
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_A8)" # GPP_A16 is the IRQ source, and GPP_A8 is the wake source
register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_A16)"
register "key.wake" = "GPE0_DW0_08" register "key.wake" = "GPE0_DW0_08"
register "key.wakeup_event_action" = "EV_ACT_DEASSERTED" register "key.wakeup_event_action" = "EV_ACT_DEASSERTED"
register "key.dev_name" = ""EJCT"" register "key.dev_name" = ""EJCT""