| Message ID | 20240213114342.2728075-1-festevam@gmail.com |
|---|---|
| State | Accepted |
| Commit | a59fb3dcf0f2099dcb8975a189408f01a8facea7 |
| Delegated to: | Fabio Estevam |
| Headers | show |
| Series | [1/5] msc_sm2s_imx8mp: Convert to DM_SERIAL | expand |
On Tue, Feb 13, 2024 at 08:43:38AM -0300, Fabio Estevam wrote: > > From: Fabio Estevam <festevam@denx.de> > > The conversion to DM_SERIAL is mandatory, so do the conversion. > > Signed-off-by: Fabio Estevam <festevam@denx.de> Reviewed-by: Ian Ray <ian.ray@gehealthcare.com> > --- > arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi | 8 ++++++++ > board/msc/sm2s_imx8mp/spl.c | 9 --------- > configs/msc_sm2s_imx8mp_defconfig | 1 + > include/configs/msc_sm2s_imx8mp.h | 2 -- > 4 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi > index c398a743f7..1a7b530d9f 100644 > --- a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi > +++ b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi > @@ -63,3 +63,11 @@ > &pmic { > bootph-pre-ram; > }; > + > +&uart2 { > + bootph-pre-ram; > +}; > + > +&pinctrl_uart2 { > + bootph-pre-ram; > +}; > diff --git a/board/msc/sm2s_imx8mp/spl.c b/board/msc/sm2s_imx8mp/spl.c > index fed0fbcba1..ed7a1b7d3d 100644 > --- a/board/msc/sm2s_imx8mp/spl.c > +++ b/board/msc/sm2s_imx8mp/spl.c > @@ -168,13 +168,6 @@ static const iomux_v3_cfg_t wdog_pads[] = { > MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), > }; > > -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) > - > -static const iomux_v3_cfg_t ser0_pads[] = { > - MX8MP_PAD_UART2_RXD__UART2_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), > - MX8MP_PAD_UART2_TXD__UART2_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), > -}; > - > int board_early_init_f(void) > { > struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; > @@ -182,8 +175,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(ser0_pads, ARRAY_SIZE(ser0_pads)); > - > return 0; > } > > diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig > index bf1052db6f..9c27a72f8a 100644 > --- a/configs/msc_sm2s_imx8mp_defconfig > +++ b/configs/msc_sm2s_imx8mp_defconfig > @@ -97,6 +97,7 @@ CONFIG_SPL_PMIC_RN5T567=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_SPL_SYSRESET=y > diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h > index c1c1fd5a78..3c7d96cb3c 100644 > --- a/include/configs/msc_sm2s_imx8mp.h > +++ b/include/configs/msc_sm2s_imx8mp.h > @@ -55,8 +55,6 @@ > #define PHYS_SDRAM_2 0xc0000000 > #define PHYS_SDRAM_2_SIZE 0x0 > > -#define CFG_MXC_UART_BASE UART2_BASE_ADDR > - > #define CFG_SYS_FSL_USDHC_NUM 2 > #define CFG_SYS_FSL_ESDHC_ADDR 0 > > -- > 2.34.1 > >
On Thu, Feb 15, 2024 at 9:05 AM Ian Ray <ian.ray@gehealthcare.com> wrote: > > On Tue, Feb 13, 2024 at 08:43:38AM -0300, Fabio Estevam wrote: > > > > From: Fabio Estevam <festevam@denx.de> > > > > The conversion to DM_SERIAL is mandatory, so do the conversion. > > > > Signed-off-by: Fabio Estevam <festevam@denx.de> > > Reviewed-by: Ian Ray <ian.ray@gehealthcare.com> Applied all, thanks.
diff --git a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi index c398a743f7..1a7b530d9f 100644 --- a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi @@ -63,3 +63,11 @@ &pmic { bootph-pre-ram; }; + +&uart2 { + bootph-pre-ram; +}; + +&pinctrl_uart2 { + bootph-pre-ram; +}; diff --git a/board/msc/sm2s_imx8mp/spl.c b/board/msc/sm2s_imx8mp/spl.c index fed0fbcba1..ed7a1b7d3d 100644 --- a/board/msc/sm2s_imx8mp/spl.c +++ b/board/msc/sm2s_imx8mp/spl.c @@ -168,13 +168,6 @@ static const iomux_v3_cfg_t wdog_pads[] = { MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) - -static const iomux_v3_cfg_t ser0_pads[] = { - MX8MP_PAD_UART2_RXD__UART2_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX8MP_PAD_UART2_TXD__UART2_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - int board_early_init_f(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; @@ -182,8 +175,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(ser0_pads, ARRAY_SIZE(ser0_pads)); - return 0; } diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig index bf1052db6f..9c27a72f8a 100644 --- a/configs/msc_sm2s_imx8mp_defconfig +++ b/configs/msc_sm2s_imx8mp_defconfig @@ -97,6 +97,7 @@ CONFIG_SPL_PMIC_RN5T567=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_SPL_SYSRESET=y diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h index c1c1fd5a78..3c7d96cb3c 100644 --- a/include/configs/msc_sm2s_imx8mp.h +++ b/include/configs/msc_sm2s_imx8mp.h @@ -55,8 +55,6 @@ #define PHYS_SDRAM_2 0xc0000000 #define PHYS_SDRAM_2_SIZE 0x0 -#define CFG_MXC_UART_BASE UART2_BASE_ADDR - #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0