[PATCH 1/5] msc_sm2s_imx8mp: Convert to DM_SERIAL

[PATCH 1/5] msc_sm2s_imx8mp: Convert to DM_SERIAL

[Fabio Estevam]

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>
---
 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

[PATCH 2/5] msc_sm2s_imx8mp: Make Ethernet functional

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

Currently, the Ethernet ports are not working.

The Ethernet PHY reset lines are controlled by the TCA6424 I2C GPIO
expander.

The TCA6424 I2C GPIO expander is supported by the CONFIG_DM_PCA953X
driver.

Select the CONFIG_DM_PCA953X option so that the Ethernet PHYs can
go through a proper reset making Ethernet to be functional.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 configs/msc_sm2s_imx8mp_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig
index 9c27a72f8a..a190c1ea22 100644
--- a/configs/msc_sm2s_imx8mp_defconfig
+++ b/configs/msc_sm2s_imx8mp_defconfig
@@ -72,6 +72,7 @@ CONFIG_CLK_COMPOSITE_CCF=y
 CONFIG_SPL_CLK_IMX8MP=y
 CONFIG_CLK_IMX8MP=y
 CONFIG_MXC_GPIO=y
+CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
-- 
2.34.1

[PATCH 3/5] imx8mp-msc-sm2s: Add mmc aliases

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

Add mmc alias so that the eMMC is mmc0 and the SD card
is mmc1 to have a well defined device numbering scheme.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
index 1a7b530d9f..ce61ca6671 100644
--- a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
@@ -9,6 +9,11 @@
 	model = "MSC SM2S-IMX8MPLUS";
 	compatible = "avnet,sm2s-imx8mp", "fsl,imx8mp";
 
+	aliases {
+		mmc0 = &usdhc3;
+		mmc1 = &usdhc2;
+	};
+
 	wdt-reboot {
 		compatible = "wdt-reboot";
 		wdt = <&wdog1>;
-- 
2.34.1

[PATCH 4/5] msc_sm2s_imx8mp: Add redundant environment support

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

Redundant environment support is required for software updates.

Add support for it.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 configs/msc_sm2s_imx8mp_defconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig
index a190c1ea22..3a49b7d55c 100644
--- a/configs/msc_sm2s_imx8mp_defconfig
+++ b/configs/msc_sm2s_imx8mp_defconfig
@@ -5,7 +5,8 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_ENV_SIZE=0x1000
+CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_OFFSET=0x200000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx8mp-msc-sm2s"
 CONFIG_SPL_TEXT_BASE=0x920000
@@ -16,6 +17,7 @@ CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL_STACK=0x960000
 CONFIG_SPL=y
+CONFIG_ENV_OFFSET_REDUND=0x204000
 CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
 CONFIG_SYS_LOAD_ADDR=0x40480000
 CONFIG_SYS_BOOT_GET_CMDLINE=y
@@ -62,6 +64,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
-- 
2.34.1

[PATCH 5/5] msc_sm2s_imx8mp: Fix CONFIG_DEFAULT_FDT_FILE

[Fabio Estevam]

From: Fabio Estevam <festevam@denx.de>

There is no imx8mp-msc-sm2s.dtb file in upstream Linux.

Change it to imx8mp-msc-sm2s-ep1.dtb.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 configs/msc_sm2s_imx8mp_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig
index 3a49b7d55c..5688c7a64d 100644
--- a/configs/msc_sm2s_imx8mp_defconfig
+++ b/configs/msc_sm2s_imx8mp_defconfig
@@ -28,7 +28,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_DEFAULT_FDT_FILE="imx8mp-msc-sm2s.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mp-msc-sm2s-ep1.dtb"
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
 CONFIG_SPL_MAX_SIZE=0x26000
-- 
2.34.1

Re: EXT: [PATCH 1/5] msc_sm2s_imx8mp: Convert to DM_SERIAL

[Ian Ray]

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
> 
> 

Re: EXT: [PATCH 2/5] msc_sm2s_imx8mp: Make Ethernet functional

[Ian Ray]

On Tue, Feb 13, 2024 at 08:43:39AM -0300, Fabio Estevam wrote:
> 
> From: Fabio Estevam <festevam@denx.de>
> 
> Currently, the Ethernet ports are not working.
> 
> The Ethernet PHY reset lines are controlled by the TCA6424 I2C GPIO
> expander.
> 
> The TCA6424 I2C GPIO expander is supported by the CONFIG_DM_PCA953X
> driver.
> 
> Select the CONFIG_DM_PCA953X option so that the Ethernet PHYs can
> go through a proper reset making Ethernet to be functional.
> 
> Signed-off-by: Fabio Estevam <festevam@denx.de>

Reviewed-by: Ian Ray <ian.ray@gehealthcare.com>

> ---
>  configs/msc_sm2s_imx8mp_defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig
> index 9c27a72f8a..a190c1ea22 100644
> --- a/configs/msc_sm2s_imx8mp_defconfig
> +++ b/configs/msc_sm2s_imx8mp_defconfig
> @@ -72,6 +72,7 @@ CONFIG_CLK_COMPOSITE_CCF=y
>  CONFIG_SPL_CLK_IMX8MP=y
>  CONFIG_CLK_IMX8MP=y
>  CONFIG_MXC_GPIO=y
> +CONFIG_DM_PCA953X=y
>  CONFIG_DM_I2C=y
>  CONFIG_LED=y
>  CONFIG_LED_GPIO=y
> -- 
> 2.34.1
> 
> 

Re: EXT: [PATCH 3/5] imx8mp-msc-sm2s: Add mmc aliases

[Ian Ray]

On Tue, Feb 13, 2024 at 08:43:40AM -0300, Fabio Estevam wrote:
> 
> From: Fabio Estevam <festevam@denx.de>
> 
> Add mmc alias so that the eMMC is mmc0 and the SD card
> is mmc1 to have a well defined device numbering scheme.
> 
> 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 | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
> index 1a7b530d9f..ce61ca6671 100644
> --- a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
> @@ -9,6 +9,11 @@
>  	model = "MSC SM2S-IMX8MPLUS";
>  	compatible = "avnet,sm2s-imx8mp", "fsl,imx8mp";
>  
> +	aliases {
> +		mmc0 = &usdhc3;
> +		mmc1 = &usdhc2;
> +	};
> +
>  	wdt-reboot {
>  		compatible = "wdt-reboot";
>  		wdt = <&wdog1>;
> -- 
> 2.34.1
> 
> 

Re: EXT: [PATCH 4/5] msc_sm2s_imx8mp: Add redundant environment support

[Ian Ray]

On Tue, Feb 13, 2024 at 08:43:41AM -0300, Fabio Estevam wrote:
> 
> From: Fabio Estevam <festevam@denx.de>
> 
> Redundant environment support is required for software updates.
> 
> Add support for it.
> 
> Signed-off-by: Fabio Estevam <festevam@denx.de>

Reviewed-by: Ian Ray <ian.ray@gehealthcare.com>

> ---
>  configs/msc_sm2s_imx8mp_defconfig | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig
> index a190c1ea22..3a49b7d55c 100644
> --- a/configs/msc_sm2s_imx8mp_defconfig
> +++ b/configs/msc_sm2s_imx8mp_defconfig
> @@ -5,7 +5,8 @@ CONFIG_SYS_MALLOC_LEN=0x2000000
>  CONFIG_SPL_GPIO=y
>  CONFIG_SPL_LIBCOMMON_SUPPORT=y
>  CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_ENV_SIZE=0x1000
> +CONFIG_ENV_SIZE=0x4000
> +CONFIG_ENV_OFFSET=0x200000
>  CONFIG_DM_GPIO=y
>  CONFIG_DEFAULT_DEVICE_TREE="imx8mp-msc-sm2s"
>  CONFIG_SPL_TEXT_BASE=0x920000
> @@ -16,6 +17,7 @@ CONFIG_SPL_SERIAL=y
>  CONFIG_SPL_DRIVERS_MISC=y
>  CONFIG_SPL_STACK=0x960000
>  CONFIG_SPL=y
> +CONFIG_ENV_OFFSET_REDUND=0x204000
>  CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
>  CONFIG_SYS_LOAD_ADDR=0x40480000
>  CONFIG_SYS_BOOT_GET_CMDLINE=y
> @@ -62,6 +64,8 @@ CONFIG_CMD_EXT4_WRITE=y
>  CONFIG_OF_CONTROL=y
>  CONFIG_SPL_OF_CONTROL=y
>  CONFIG_ENV_OVERWRITE=y
> +CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
>  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_USE_ETHPRIME=y
> -- 
> 2.34.1
> 
> 

Re: EXT: [PATCH 5/5] msc_sm2s_imx8mp: Fix CONFIG_DEFAULT_FDT_FILE

[Ian Ray]

On Tue, Feb 13, 2024 at 08:43:42AM -0300, Fabio Estevam wrote:
> 
> From: Fabio Estevam <festevam@denx.de>
> 
> There is no imx8mp-msc-sm2s.dtb file in upstream Linux.
> 
> Change it to imx8mp-msc-sm2s-ep1.dtb.
> 
> Signed-off-by: Fabio Estevam <festevam@denx.de>

Reviewed-by: Ian Ray <ian.ray@gehealthcare.com>

> ---
>  configs/msc_sm2s_imx8mp_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/msc_sm2s_imx8mp_defconfig b/configs/msc_sm2s_imx8mp_defconfig
> index 3a49b7d55c..5688c7a64d 100644
> --- a/configs/msc_sm2s_imx8mp_defconfig
> +++ b/configs/msc_sm2s_imx8mp_defconfig
> @@ -28,7 +28,7 @@ CONFIG_SPL_LOAD_FIT=y
>  CONFIG_SYS_BOOTM_LEN=0x2000000
>  CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_OF_SYSTEM_SETUP=y
> -CONFIG_DEFAULT_FDT_FILE="imx8mp-msc-sm2s.dtb"
> +CONFIG_DEFAULT_FDT_FILE="imx8mp-msc-sm2s-ep1.dtb"
>  CONFIG_SYS_CBSIZE=2048
>  CONFIG_SYS_PBSIZE=2074
>  CONFIG_SPL_MAX_SIZE=0x26000
> -- 
> 2.34.1
> 
> 

Re: EXT: [PATCH 1/5] msc_sm2s_imx8mp: Convert to DM_SERIAL

[Fabio Estevam]

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.