Skip to contentSkip to conversation

board: bsh: imx8mn_bsh_smm_s2/s2pro: enable DM_SERIAL

PATCH In review Michael Trimarchi 3 participants 5 messages Apr 18, 2022 – Apr 22, 2022 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 board: bsh: imx8mn_bsh_smm_s2/s2pro: enable DM_SERIAL

Enable DM_SERIAL for both U_Boot and the SPL. The uart4 and its pinmux are already marked with u-boot,dm-spl but we need to move the call to preloader_console_init() after spl_init() to avoid a board hang as dm can't be used until after spl_init().

Remove the manual config of the UART pinmux now that it is no longer needed.

---
V2->V3:
- Add Fabio Estevam review
- change typo in uart2 to uart4
V1->V2:
- Follow Tim Harvery suggestion on Peng change
- Adjust the commit message as Tim

---
 board/bsh/imx8mn_smm_s2/spl.c          | 11 ++---------
 configs/imx8mn_bsh_smm_s2_defconfig    |  1 +
 configs/imx8mn_bsh_smm_s2pro_defconfig |  1 +
 3 files changed, 4 insertions(+), 9 deletions(-)
board/bsh/imx8mn_smm_s2/spl.c +2 -9
index 5f04731d72..0f61acc630 100644
@@ -40,14 +40,8 @@ void spl_board_init(void)
 		puts("Failed to find clock node. Check device tree\n");
 }
 
-#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)
 
-static const iomux_v3_cfg_t uart_pads[] = {
-	IMX8MN_PAD_UART4_RXD__UART4_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-	IMX8MN_PAD_UART4_TXD__UART4_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
 static const iomux_v3_cfg_t wdog_pads[] = {
 	IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL),
 };
@@ -59,7 +53,6 @@ int board_early_init_f(void)
 	imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
 	set_wdog_reset(wdog);
 
-	imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
 	init_uart_clk(3);
 
 	if (IS_ENABLED(CONFIG_NAND_MXS)) {
@@ -82,14 +75,14 @@ void board_init_f(ulong dummy)
 
 	timer_init();
 
-	preloader_console_init();
-
 	ret = spl_init();
 	if (ret) {
 		debug("spl_init() failed: %d\n", ret);
 		hang();
 	}
 
+	preloader_console_init();
+
 	/* DDR initialization */
 	spl_dram_init();
 
configs/imx8mn_bsh_smm_s2_defconfig +1 -0
index 3d67079a46..e864685a62 100644
@@ -80,6 +80,7 @@ CONFIG_SPL_DM_PMIC_BD71837=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
configs/imx8mn_bsh_smm_s2pro_defconfig +1 -0
index c5809f5d4b..dfc9c93809 100644
@@ -77,6 +77,7 @@ CONFIG_SPL_DM_PMIC_BD71837=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
Signature · 1 line
2.25.1
Tested-by on v3 1/1
#1 lore raw

Hi Michael,

Quoted 11 lines · Michael Trimarchi

Enable DM_SERIAL for both U_Boot and the SPL. The uart4 and its pinmux are already marked with u-boot,dm-spl but we need to move the call to preloader_console_init() after spl_init() to avoid a board hang as dm can't be used until after spl_init().

Remove the manual config of the UART pinmux now that it is no longer needed.

#2 lore raw

Hi Stefano

Quoted 9 lines · Ariel D'Alessandro

Hi Michael,

Quoted 5 lines · Michael Trimarchi

Enable DM_SERIAL for both U_Boot and the SPL. The uart4 and its pinmux are already marked with u-boot,dm-spl but we need to move the call to preloader_console_init() after spl_init() to avoid a board hang as dm can't be used until after spl_init().

Quoted 8 lines
Quoted 6 lines

Remove the manual config of the UART pinmux now that it is no longer needed.

Can you queue this one too?

Michael

Signature · 11 lines
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
[email protected]
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
[email protected]
www.amarulasolutions.com
#3 lore raw
Quoted 16 lines · Michael Nazzareno Trimarchi

Hi Stefano

Quoted 12 lines · Ariel D'Alessandro

Hi Michael,

Quoted 8 lines · Michael Trimarchi

Enable DM_SERIAL for both U_Boot and the SPL. The uart4 and its pinmux are already marked with u-boot,dm-spl but we need to move the call to preloader_console_init() after spl_init() to avoid a board hang as dm can't be used until after spl_init().

Remove the manual config of the UART pinmux now that it is no longer needed.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

Can you queue this one too?

It is already applied to master-next, CI is running, if no issue are reported is merged into -master.

Best regards,
Stefano

Quoted 4 lines

Michael

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#4 lore raw

PATCH v3 1/1 board: bsh: imx8mn_bsh_smm_s2/s2pro: enable DM_SERIAL

In reply to Michael Trimarchi
Quoted 10 lines

Enable DM_SERIAL for both U_Boot and the SPL. The uart4 and its pinmux are already marked with u-boot,dm-spl but we need to move the call to preloader_console_init() after spl_init() to avoid a board hang as dm can't be used until after spl_init().
Remove the manual config of the UART pinmux now that it is no longer needed.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================