summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/gateworks/gw_ventana/gw_ventana.c12
-rw-r--r--configs/gwventana_emmc_defconfig2
-rw-r--r--configs/gwventana_gw5904_defconfig2
-rw-r--r--configs/gwventana_nand_defconfig2
4 files changed, 6 insertions, 12 deletions
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index fb745ccceee..0fbbfb83463 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -24,7 +24,6 @@
#include <asm/io.h>
#include <asm/setup.h>
#include <dm.h>
-#include <dm/platform_data/serial_mxc.h>
#include <env.h>
#include <hwconfig.h>
#include <i2c.h>
@@ -628,8 +627,6 @@ void get_board_serial(struct tag_serialnr *serialnr)
int board_early_init_f(void)
{
- setup_iomux_uart();
-
#if defined(CONFIG_VIDEO_IPUV3)
setup_display();
#endif
@@ -1389,12 +1386,3 @@ int ft_board_setup(void *blob, struct bd_info *bd)
return 0;
}
#endif /* CONFIG_OF_BOARD_SETUP */
-
-static struct mxc_serial_plat ventana_mxc_serial_plat = {
- .reg = (struct mxc_uart *)UART2_BASE,
-};
-
-U_BOOT_DRVINFO(ventana_serial) = {
- .name = "serial_mxc",
- .plat = &ventana_mxc_serial_plat,
-};
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 453c80dd4c4..433de5ece3d 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -87,6 +87,8 @@ CONFIG_PHYLIB=y
CONFIG_E1000=y
CONFIG_MII=y
CONFIG_PCI=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
CONFIG_CONS_INDEX=2
CONFIG_DM_SERIAL=y
CONFIG_MXC_UART=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 4dc636637f7..4fd734e260e 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -91,6 +91,8 @@ CONFIG_MV88E61XX_FIXED_PORTS=0x0
CONFIG_E1000=y
CONFIG_MII=y
CONFIG_PCI=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
CONFIG_CONS_INDEX=2
CONFIG_DM_SERIAL=y
CONFIG_MXC_UART=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index bd843403080..5d8126e9771 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -91,6 +91,8 @@ CONFIG_PHYLIB=y
CONFIG_E1000=y
CONFIG_MII=y
CONFIG_PCI=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
CONFIG_CONS_INDEX=2
CONFIG_DM_SERIAL=y
CONFIG_MXC_UART=y