From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 8/8] ARM: imx: vining2000: Enable DM Serial
Date: Fri, 17 May 2019 22:25:28 +0200 [thread overview]
Message-ID: <20190517202528.7801-9-marex@denx.de> (raw)
In-Reply-To: <20190517202528.7801-1-marex@denx.de>
Enable DM Serial support on iMX6SX VINING|2000.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Silvio Fricke <silvio.fricke@softing.com>
Cc: Stefano Babic <sbabic@denx.de>
---
board/softing/vining_2000/vining_2000.c | 12 ------------
configs/vining_2000_defconfig | 3 +++
include/configs/vining_2000.h | 3 ---
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index d960773671..19b9b37276 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -71,11 +71,6 @@ int dram_init(void)
return 0;
}
-static iomux_v3_cfg_t const uart1_pads[] = {
- MX6_PAD_GPIO1_IO04__UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
- MX6_PAD_GPIO1_IO05__UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
static iomux_v3_cfg_t const fec1_pads[] = {
MX6_PAD_ENET1_MDC__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_ENET1_MDIO__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL),
@@ -97,11 +92,6 @@ static iomux_v3_cfg_t const pwm_led_pads[] = {
MX6_PAD_RGMII2_RD3__PWM1_OUT | MUX_PAD_CTRL(NO_PAD_CTRL), /* blue */
};
-static void setup_iomux_uart(void)
-{
- imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
-}
-
#define PHY_RESET IMX_GPIO_NR(5, 9)
int board_eth_init(bd_t *bis)
@@ -419,8 +409,6 @@ int board_late_init(void)
int board_early_init_f(void)
{
- setup_iomux_uart();
-
setup_iomux_usb();
return 0;
diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index 0a2b042ed1..9e8326e771 100644
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -49,6 +49,9 @@ CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_MXC_UART=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index fd98c1417e..d4db9b4a56 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -17,9 +17,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
-#define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE UART1_BASE
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(MMC, mmc, 1) \
--
2.20.1
next prev parent reply other threads:[~2019-05-17 20:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 20:25 [U-Boot] [PATCH 0/8] ARM: imx: Update VINING|2000 to DM/DT Marek Vasut
2019-05-17 20:25 ` [U-Boot] [PATCH 1/8] ARM: imx: Rename VINING|2000 Marek Vasut
2019-06-10 9:49 ` sbabic at denx.de
2019-05-17 20:25 ` [U-Boot] [PATCH 2/8] ARM: dts: imx: vining2000: Import VINING|2000 DT from Linux Marek Vasut
2019-06-10 9:41 ` [U-Boot] [PATCH 2/8] ARM: dts: imx: vining2000: Import VINING|2000 sbabic at denx.de
2019-05-17 20:25 ` [U-Boot] [PATCH 3/8] ARM: imx: vining2000: Enable DM pin control Marek Vasut
2019-06-10 9:39 ` sbabic at denx.de
2019-05-17 20:25 ` [U-Boot] [PATCH 4/8] ARM: imx: vining2000: Convert MMC and block to DM Marek Vasut
2019-06-10 9:41 ` sbabic at denx.de
2019-05-17 20:25 ` [U-Boot] [PATCH 5/8] ARM: imx: vining2000: Enable DM USB Marek Vasut
2019-06-10 9:41 ` sbabic at denx.de
2019-05-17 20:25 ` [U-Boot] [PATCH 6/8] ARM: imx: vining2000: Enable DM GPIO Marek Vasut
2019-06-10 9:40 ` sbabic at denx.de
2019-05-17 20:25 ` [U-Boot] [PATCH 7/8] ARM: imx: vining2000: Enable DM PCI Marek Vasut
2019-06-10 9:40 ` sbabic at denx.de
2019-05-17 20:25 ` Marek Vasut [this message]
2019-06-10 9:40 ` [U-Boot] [PATCH 8/8] ARM: imx: vining2000: Enable DM Serial sbabic at denx.de
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190517202528.7801-9-marex@denx.de \
--to=marex@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox