diff options
author | Tom Rini <trini@konsulko.com> | 2016-01-28 10:07:22 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-01-28 10:07:22 -0500 |
commit | 4b5a4a0535e280279e8cab93ba6d4aad53896bda (patch) | |
tree | 4fa29a88ad6e46ed889b65fef753f835a3685a67 /arch/x86/cpu/baytrail/early_uart.c | |
parent | cd85bec36d0e0d16fedb00e0c434ed070a9c6b37 (diff) | |
parent | 81aaa3d9fce5ce9641e5f0c3354da876d859b3b6 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/baytrail/early_uart.c')
-rw-r--r-- | arch/x86/cpu/baytrail/early_uart.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c index b64a3a90db4..471d592b49f 100644 --- a/arch/x86/cpu/baytrail/early_uart.c +++ b/arch/x86/cpu/baytrail/early_uart.c @@ -59,11 +59,15 @@ static void x86_pci_write_config32(int dev, unsigned int where, u32 value) } /* This can be called after memory-mapped PCI is working */ -int setup_early_uart(void) +int setup_internal_uart(int enable) { - /* Enable the legacy UART hardware. */ + /* Enable or disable the legacy UART hardware */ x86_pci_write_config32(PCI_DEV_CONFIG(0, LPC_DEV, LPC_FUNC), UART_CONT, - 1); + enable); + + /* All done for the disable part, so just return */ + if (!enable) + return 0; /* * Set up the pads to the UART function. This allows the signals to |