From afa6a2de4848ad8661b041c3b5e6de8da2ee0abc Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Tue, 17 Sep 2019 10:51:15 +0200 Subject: mb/gigabyte/ga-h61m-s2pv: Improve LPC decoding Drop unused CNF2_LPC_EN, as there is no device which uses IO 0x4e/4f. Do not use the mainboard model to set COMA_LPC_EN. Make use of NO_UART_ON_SUPERIO instead, as it is more future-proof. Change-Id: Iac49250b0f509a42012f82db8aa85ba85559c66f Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/35444 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/mainboard/gigabyte/ga-h61m-s2pv') diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c b/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c index 27fbb2ccc7..a51595f4ff 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/romstage.c @@ -25,14 +25,11 @@ void pch_enable_lpc(void) { - if (CONFIG(BOARD_GIGABYTE_GA_H61M_S2PV)) { - pci_write_config16(PCH_LPC_DEV, LPC_EN, KBC_LPC_EN | - CNF1_LPC_EN | CNF2_LPC_EN | COMA_LPC_EN); - pci_write_config16(PCH_LPC_DEV, LPC_IO_DEC, 0x10); + pci_write_config16(PCH_LPC_DEV, LPC_EN, KBC_LPC_EN | CNF1_LPC_EN); - } else if (CONFIG(BOARD_GIGABYTE_GA_H61MA_D3V)) { - pci_write_config16(PCH_LPC_DEV, LPC_EN, KBC_LPC_EN | - CNF1_LPC_EN); + if (!CONFIG(NO_UART_ON_SUPERIO)) { + pci_or_config16(PCH_LPC_DEV, LPC_EN, COMA_LPC_EN); + pci_write_config16(PCH_LPC_DEV, LPC_IO_DEC, 0x10); } } -- cgit v1.2.3