summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-07-15 16:39:17 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2014-07-15 16:42:39 +0200
commitaa042b463e6582b2f47c21f5f2c669dbbd8632aa (patch)
treeff20ee2f92a2ac9d23bdcc33ef2812dbb4b51509
parent07407aeb034ff86d2609cec6bbf073492db6a9bf (diff)
apalis-imx6: use DCE UARTs for now
Apalis iMX6+ 1GB V1.0A V1.0B are wired for DCE, now that the code is prepared for DTE switch back to DCE.
-rw-r--r--board/toradex/apalis_imx6/apalis_imx6.c2
-rw-r--r--include/configs/apalis-imx6.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 223af1f4c8..0cce5e1f22 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -268,6 +268,7 @@ iomux_v3_cfg_t const usb_pads[] = {
#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);
@@ -275,6 +276,7 @@ static void setup_dtemode_uart(void)
SET_DCEDTE(UART4_BASE + UFCR);
SET_DCEDTE(UART5_BASE + UFCR);
}
+#endif
static void setup_iomux_uart(void)
{
diff --git a/include/configs/apalis-imx6.h b/include/configs/apalis-imx6.h
index 7ebd2941bf..4ee885950b 100644
--- a/include/configs/apalis-imx6.h
+++ b/include/configs/apalis-imx6.h
@@ -42,9 +42,9 @@
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
-#define CONFIG_MXC_UART_DTE /* use the uart in DTE mode */
+//#define CONFIG_MXC_UART_DTE /* use the uart in DTE mode */
-/* Make the HW version stuff available to in u-boot env */
+/* Make the HW version stuff available in u-boot env */
#define CONFIG_VERSION_VARIABLE /* ver environment variable */
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG