[PATCH 10/15] imx: kontron-sl-mx8mm: enable DM_SERIAL

[Frieder Schrempf]

Am 30.04.22 um 14:43 schrieb Peng Fan (OSS):
> From: Peng Fan <peng.fan at nxp.com>
> 
> Enable CONFIG_DM_SERIAL. uart and its pinmux was already
> marked with u-boot,dm-spl.
> Move preloader_console_init after spl_init to make sure driver
> model work.
> 
> Signed-off-by: Peng Fan <peng.fan at nxp.com>

Acked-by: Frieder Schrempf <frieder.schrempf at kontron.de>

> ---
>  board/kontron/sl-mx8mm/spl.c       | 12 ++----------
>  configs/kontron-sl-mx8mm_defconfig |  1 +
>  include/configs/kontron-sl-mx8mm.h |  1 -
>  3 files changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c
> index 4ef03c8c172..a58a75dc958 100644
> --- a/board/kontron/sl-mx8mm/spl.c
> +++ b/board/kontron/sl-mx8mm/spl.c
> @@ -32,7 +32,6 @@ enum {
>  
>  #define GPIO_PAD_CTRL	(PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
>  #define I2C_PAD_CTRL	(PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE)
> -#define UART_PAD_CTRL	(PAD_CTL_DSE6 | PAD_CTL_FSEL1)
>  #define WDOG_PAD_CTRL	(PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
>  
>  #define TOUCH_RESET_GPIO	IMX_GPIO_NR(3, 23)
> @@ -51,11 +50,6 @@ static iomux_v3_cfg_t const touch_gpio[] = {
>  	IMX8MM_PAD_SAI5_RXD2_GPIO3_IO23 | MUX_PAD_CTRL(GPIO_PAD_CTRL)
>  };
>  
> -static iomux_v3_cfg_t const uart_pads[] = {
> -	IMX8MM_PAD_UART3_RXD_UART3_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
> -	IMX8MM_PAD_UART3_TXD_UART3_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
> -};
> -
>  static iomux_v3_cfg_t const wdog_pads[] = {
>  	IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B  | MUX_PAD_CTRL(WDOG_PAD_CTRL),
>  };
> @@ -230,8 +224,6 @@ int board_early_init_f(void)
>  
>  	set_wdog_reset(wdog);
>  
> -	imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
> -
>  	return 0;
>  }
>  
> @@ -273,8 +265,6 @@ void board_init_f(ulong dummy)
>  
>  	timer_init();
>  
> -	preloader_console_init();
> -
>  	/* Clear the BSS. */
>  	memset(__bss_start, 0, __bss_end - __bss_start);
>  
> @@ -284,6 +274,8 @@ void board_init_f(ulong dummy)
>  		hang();
>  	}
>  
> +	preloader_console_init();
> +
>  	enable_tzc380();
>  
>  	/* PMIC initialization */
> diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig
> index 1375c78a8c4..44ed4f3fb1f 100644
> --- a/configs/kontron-sl-mx8mm_defconfig
> +++ b/configs/kontron-sl-mx8mm_defconfig
> @@ -103,6 +103,7 @@ CONFIG_DM_REGULATOR=y
>  CONFIG_DM_RTC=y
>  CONFIG_RTC_RV8803=y
>  CONFIG_CONS_INDEX=2
> +CONFIG_DM_SERIAL=y
>  CONFIG_MXC_UART=y
>  CONFIG_SPI=y
>  CONFIG_DM_SPI=y
> diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
> index 1b429f7dbe2..20f7f7a74f5 100644
> --- a/include/configs/kontron-sl-mx8mm.h
> +++ b/include/configs/kontron-sl-mx8mm.h
> @@ -28,7 +28,6 @@
>  	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>  
>  /* Board and environment settings */
> -#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
>  #define CONFIG_HOSTNAME			"kontron-mx8mm"
>  
>  #ifdef CONFIG_USB_EHCI_HCD