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

emeraldlake2: Clean up COM port enable 

Remove the COM port enable loop. There is no need to
search for the port when it is needed and known by the
GPIO function.

Change-Id: Ie4e533fd9e49ed9ae62b209317b4b9853ff9926a
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/4027
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Marc Jones 2013-11-05 17:47:37 -07:00 committed by Kyösti Mälkki
parent af0cd0921a
commit c4b6f3bacb
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mainboard/intel/emeraldlake2/romstage.c
View File

@ -42,31 +42,29 @@
#include <vendorcode/google/chromeos/chromeos.h> #include <vendorcode/google/chromeos/chromeos.h>
#endif #endif
#define SIO_PORT 0x164e
static void pch_enable_lpc(void) static void pch_enable_lpc(void)
{ {
device_t dev = PCH_LPC_DEV; device_t dev = PCH_LPC_DEV;
int i;
/* Set COM1/COM2 decode range */ /* Set COM1/COM2 decode range */
pci_write_config16(dev, LPC_IO_DEC, 0x0010); pci_write_config16(dev, LPC_IO_DEC, 0x0010);
/* Enable SuperIO + COM1 + PS/2 Keyboard/Mouse */ /* Enable SuperIO + PS/2 Keyboard/Mouse */
u16 lpc_config = CNF1_LPC_EN | CNF2_LPC_EN | COMA_LPC_EN | KBC_LPC_EN; u16 lpc_config = CNF1_LPC_EN | CNF2_LPC_EN | KBC_LPC_EN;
pci_write_config16(dev, LPC_EN, lpc_config); pci_write_config16(dev, LPC_EN, lpc_config);
/* Map 256 bytes at 0x1600 to the LPC bus. */ /* Map 256 bytes at 0x1600 to the LPC bus. */
pci_write_config32(dev, LPC_GEN1_DEC, 0xfc1601); pci_write_config32(dev, LPC_GEN1_DEC, 0xfc1601);
/* Map a range for the runtime registers to the LPC bus. */ /* Map a range for the runtime_port registers to the LPC bus. */
pci_write_config32(dev, LPC_GEN2_DEC, 0xc0181); pci_write_config32(dev, LPC_GEN2_DEC, 0xc0181);
for (i = 0; i < ARRAY_SIZE(sio1007_lpc_ports); i++) { /* Enable COM1 */
if (sio1007_enable_uart_at(sio1007_lpc_ports[i])) { if (sio1007_enable_uart_at(SIO_PORT)) {
/* Keep COMA UART enable bit on. */ pci_write_config16(dev, LPC_EN,
pci_write_config16(dev, LPC_EN, lpc_config | COMA_LPC_EN);
lpc_config | COMA_LPC_EN);
break;
}
} }
} }
@ -132,7 +130,7 @@ static void early_pch_init(void)
static void setup_sio_gpios(void) static void setup_sio_gpios(void)
{ {
const u16 port = 0x164e; const u16 port = SIO_PORT;
const u16 runtime_port = 0x180; const u16 runtime_port = 0x180;
/* Turn on configuration mode. */ /* Turn on configuration mode. */