This properly configures the mux to enable the right UART depending on
the setting of CONFIG_SERIALX.

This also fixes things so that we don't configure balls XUCTSN_1 and
XURTSN_1 as UART1 configuration (RTS/CTS), since they aren't
connected.

Signed-off-by: Doug Anderson <diand...@chromium.org>
---
 board/samsung/smdk5250/smdk5250.c |   49 +++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/board/samsung/smdk5250/smdk5250.c 
b/board/samsung/smdk5250/smdk5250.c
index 928c08f..61b8634 100644
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -224,11 +224,56 @@ static void board_uart_init(void)
                (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
        int i;
 
-       /* UART1 GPIOs (part1) : GPA0CON[7:4] 0x2222 */
-       for (i = 4; i < 8; i++) {
+#if defined(CONFIG_SERIAL0)
+       /*
+        * UART0 GPIOs : GPA0CON[3:0] 0x2222
+        * Must set CFG17 switches to select UART0 to use.
+        */
+       for (i = 0; i <= 3; i++) {
                s5p_gpio_set_pull(&gpio1->a0, i, GPIO_PULL_NONE);
                s5p_gpio_cfg_pin(&gpio1->a0, i, GPIO_FUNC(0x2));
        }
+#elif defined(CONFIG_SERIAL1)
+       /*
+        * UART1 GPIOs : GPA0CON[5:4] 0x22
+        * Must set CFG17 switches to select UART1 to use.
+        *
+        * This only sets RXD/TXD, as RTS/CTS need a resister soldered down
+        * in order to use them (so that those pins can be used for I2C).
+        */
+       for (i = 4; i <= 5; i++) {
+               s5p_gpio_set_pull(&gpio1->a0, i, GPIO_PULL_NONE);
+               s5p_gpio_cfg_pin(&gpio1->a0, i, GPIO_FUNC(0x2));
+       }
+#elif defined(CONFIG_SERIAL2)
+       /*
+        * UART2 GPIOs : GPA1CON[1:0] 0x22
+        * Must set CFG17 switches to select UART2 to use.
+        *
+        * This only sets RXD/TXD, as RTS/CTS need a resister soldered down
+        * in order to use them (so that those pins can be used for I2C).
+        */
+       for (i = 0; i <= 1; i++) {
+               s5p_gpio_set_pull(&gpio1->a1, i, GPIO_PULL_NONE);
+               s5p_gpio_cfg_pin(&gpio1->a1, i, GPIO_FUNC(0x2));
+       }
+#elif defined(CONFIG_SERIAL3)
+       /*
+        * UART3 GPIOs : GPA1CON[5:4] 0x22
+        * Must set CFG16 switches to select UART3 to use.
+        */
+       for (i = 4; i <= 5; i++) {
+               s5p_gpio_set_pull(&gpio1->a1, i, GPIO_PULL_NONE);
+               s5p_gpio_cfg_pin(&gpio1->a1, i, GPIO_FUNC(0x2));
+       }
+#elif defined(CONFIG_SERIAL4)
+       /*
+        * There's no mux for UART4--it's internal only
+        */
+#error "Can't set console to serial 4--it's not exposed"
+#else
+#error "Unknown serial config"
+#endif
 }
 
 #ifdef CONFIG_BOARD_EARLY_INIT_F
-- 
1.7.7.3

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to