diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-12-05 15:15:34 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-12-05 17:37:23 +0100 |
| commit | 763d0100c99ae089f49f57466abb960a1ff2426d (patch) | |
| tree | 023edf836670a31e6b2a86ac94083ec37dc6ae0f | |
| parent | b21b3066d39a6cdb678b4e8c07f404dda96bfae7 (diff) | |
colibri_imx6: use UART DTE mode unconditionally
| -rw-r--r-- | board/toradex/colibri_imx6/colibri_imx6.c | 11 | ||||
| -rw-r--r-- | include/configs/colibri_imx6.h | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index d7d53271c4..ea342a63a7 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -85,13 +85,8 @@ int dram_init(void) /* Colibri UARTA */ iomux_v3_cfg_t const uart1_pads[] = { -#ifndef CONFIG_MXC_UART_DTE - MX6_PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), -#else MX6_PAD_CSI0_DAT10__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), -#endif }; #define PC MUX_PAD_CTRL(I2C_PAD_CTRL) @@ -180,27 +175,23 @@ iomux_v3_cfg_t const usb_pads[] = { #endif }; -/* if UARTs are used in DTE mode, so switch the mode on all UARTs before +/* UARTs are used in DTE mode, switch the mode on all UARTs before * any pinmuxing connects a (DCE) output to a transceiver output. */ #define UFCR 0x90 /* FIFO Control Register */ #define UFCR_DCEDTE (1<<6) /* DCE=0 */ #define SET_DCEDTE(p) (writel( (readl((u32 *) (p)) | UFCR_DCEDTE), (u32 *) (p))) -#ifdef CONFIG_MXC_UART_DTE static void setup_dtemode_uart(void) { SET_DCEDTE(UART1_BASE + UFCR); SET_DCEDTE(UART2_BASE + UFCR); SET_DCEDTE(UART3_BASE + UFCR); } -#endif static void setup_iomux_uart(void) { -#ifdef CONFIG_MXC_UART_DTE setup_dtemode_uart(); -#endif imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); } diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index dc1467708a..a941ed46f3 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -40,7 +40,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_MXC_UART_DTE /* use the uart in DTE mode */ /* Make the HW version stuff available in u-boot env */ #define CONFIG_VERSION_VARIABLE /* ver environment variable */ |