summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--board/scb9328/scb9328.c4
-rw-r--r--drivers/serial/serial_imx.c7
2 files changed, 4 insertions, 7 deletions
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index 55440093da..834d0c29cd 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -74,6 +74,10 @@ static struct device_d scb9328_serial_device = {
static int scb9328_console_init(void)
{
+ /* init gpios for serial port */
+ imx_gpio_mode(PC11_PF_UART1_TXD);
+ imx_gpio_mode(PC12_PF_UART1_RXD);
+
register_device(&scb9328_serial_device);
return 0;
}
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index e6d80b91af..35a35970ef 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -62,13 +62,6 @@ static int imx_serial_init_port(struct console_device *cdev)
{
#if 0
volatile struct imx_serial* base = (struct imx_serial *)UART_BASE;
-#ifdef CONFIG_IMX_SERIAL1
- imx_gpio_mode(PC11_PF_UART1_TXD);
- imx_gpio_mode(PC12_PF_UART1_RXD);
-#else
- imx_gpio_mode(PB30_PF_UART2_TXD);
- imx_gpio_mode(PB31_PF_UART2_RXD);
-#endif
/* Disable UART */
base->ucr1 &= ~UCR1_UARTEN;