summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-08-09 00:31:09 -0700
committerPatrick Georgi <patrick@georgi-clan.de>2013-12-21 22:46:20 +0100
commit136e7090152d91ad0e1efcf4869e23fbaa6f453c (patch)
tree3c4198d0f9d325e26ef5bff8b44805ab5b39058a
parentce011ec1317eebdcec91f29d206869ac0a71c23a (diff)
exynos5420: Configure the UART pins unconditionally
Configure the pins for the UART unconditionally in the mainboard code (when we know which UART to configure) instead of in the UART driver. This also means the UART will work if later software wants to use it without setting up the pins. Built and booted on pit with the serial turned off and some serial init in the kernel decompression stub fixed. Change-Id: Icab5755e4f935f52d44b9cb3b43d1cb62acce08f Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/65299 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Queue: Gabe Black <gabeblack@chromium.org> Tested-by: Gabe Black <gabeblack@chromium.org> Reviewed-on: http://review.coreboot.org/4457 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--src/cpu/samsung/exynos5420/uart.c3
-rw-r--r--src/mainboard/google/pit/romstage.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/cpu/samsung/exynos5420/uart.c b/src/cpu/samsung/exynos5420/uart.c
index de71b80034..c5c8a8c6b4 100644
--- a/src/cpu/samsung/exynos5420/uart.c
+++ b/src/cpu/samsung/exynos5420/uart.c
@@ -93,9 +93,6 @@ static void exynos5_init_dev(void)
{
struct s5p_uart *uart = (struct s5p_uart *)base_port;
- // TODO initialize with correct peripheral id by base_port.
- exynos_pinmux_uart3();
-
/* enable FIFOs */
writel(0x1, &uart->ufcon);
writel(0, &uart->umcon);
diff --git a/src/mainboard/google/pit/romstage.c b/src/mainboard/google/pit/romstage.c
index 853e24dd70..b74c27fcee 100644
--- a/src/mainboard/google/pit/romstage.c
+++ b/src/mainboard/google/pit/romstage.c
@@ -250,6 +250,7 @@ void main(void)
* to re-initialize serial console drivers again. */
system_clock_init();
+ exynos_pinmux_uart3();
console_init();
setup_power(is_resume);