From b80d1324d3e86c0b8c72fd7cd09df07794931059 Mon Sep 17 00:00:00 2001 From: Ivy Jian Date: Mon, 27 May 2019 11:19:44 +0800 Subject: [PATCH] mb/google/poppy/variants/nami: Disable FPMCU for non-fingerprint variants Even fingerprint device probe failed on non-fingerpint boards,the CRFP driver still register the device that cause the GPE#1 as wake source every time. Override devicetree for non-fingerpirnt variants to avoid unexpected wake event(GPE#1). BUG=b:129650040 BRANCH=firmware-nami-10775.108.B TEST=Boots to OS and check no GPE#1 wake event from eventlog when S0ix exit. Signed-off-by: Ivy Jian Change-Id: I6fa96e04a34e296889414b96a8c604fc61b8a236 Reviewed-on: https://review.coreboot.org/c/coreboot/+/33017 Reviewed-by: EricR Lai Reviewed-by: John Su Tested-by: build bot (Jenkins) --- src/mainboard/google/poppy/variants/nami/mainboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index dff62c217c..cc87136520 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -238,6 +238,7 @@ void variant_devtree_update(void) struct device *root = SA_DEV_ROOT; config_t *cfg = root->chip_info; uint8_t pl2_id = PL2_ID_DEFAULT; + struct device *spi_fpmcu = PCH_DEV_GSPI1; switch (sku_id) { case SKU_0_SONA: @@ -260,6 +261,7 @@ void variant_devtree_update(void) case SKU_3_PANTHEON: case SKU_4_PANTHEON: cfg->usb2_ports[5].enable = 0; + spi_fpmcu->enabled = 0; break; case SKU_0_BARD: case SKU_1_BARD: