diff options
Diffstat (limited to 'src/mainboard/google/skyrim')
4 files changed, 9 insertions, 4 deletions
diff --git a/src/mainboard/google/skyrim/ec.c b/src/mainboard/google/skyrim/ec.c index bc29833713..05994eb4c2 100644 --- a/src/mainboard/google/skyrim/ec.c +++ b/src/mainboard/google/skyrim/ec.c @@ -10,8 +10,8 @@ static const struct sci_source espi_sci_sources[] = { { - .scimap = SMITYPE_ESPI_SYS, - .gpe = GEVENT_3, + .scimap = SMITYPE_ESPI_SCI_B, + .gpe = EC_SCI_GPI, .direction = SMI_SCI_LVL_HIGH, /* enum smi_sci_lvl */ .level = SMI_SCI_EDG, /* enum smi_sci_dir */ } diff --git a/src/mainboard/google/skyrim/mainboard.c b/src/mainboard/google/skyrim/mainboard.c index 7c89f49b48..cb91555f71 100644 --- a/src/mainboard/google/skyrim/mainboard.c +++ b/src/mainboard/google/skyrim/mainboard.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <amdblocks/acpimmio.h> #include <amdblocks/amd_pci_util.h> #include <baseboard/variants.h> #include <console/console.h> @@ -111,6 +112,10 @@ static void mainboard_enable(struct device *dev) init_tables(); /* Initialize the PIRQ data structures for consumption */ pirq_setup(); + + /* TODO: b/184678786 - Move into espi_config */ + /* Unmask eSPI IRQ 1 (Keyboard) */ + pm_write32(PM_ESPI_INTR_CTRL, PM_ESPI_DEV_INTR_MASK & ~(BIT(1))); } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb index a6894eefa4..f0d103957d 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb @@ -35,7 +35,7 @@ chip soc/amd/sabrina .oob_ch_en = 0, .flash_ch_en = 0, - .vw_irq_polarity = ESPI_VW_IRQ_LEVEL_HIGH(1) | ESPI_VW_IRQ_LEVEL_HIGH(12), + .vw_irq_polarity = ESPI_VW_IRQ_LEVEL_HIGH(1), }" register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | diff --git a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h index d66d3cb775..f10146dafc 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/ec.h @@ -52,7 +52,7 @@ */ /* Set GPI for SCI */ -#define EC_SCI_GPI GEVENT_3 /* eSPI system event -> GPE 3 */ +#define EC_SCI_GPI GEVENT_24 /* eSPI system event -> GPE 24 */ /* Enable LID switch and provide wake pin for EC */ #define EC_ENABLE_LID_SWITCH |