[PATCH 03/15] board: ti: j721e: evm: Drop board check for ESM

[Kumar, Udit]

On 11/3/2023 6:07 AM, Nishanth Menon wrote:
> When config is enabled, the esm dt probe makes sense. Simplify by
> dropping board specific checks.
>
> Signed-off-by: Nishanth Menon <nm at ti.com>
> ---
>   board/ti/j721e/evm.c | 10 ++--------
>   1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
> index d4f7c1d9f938..75d51a0552c4 100644
> --- a/board/ti/j721e/evm.c
> +++ b/board/ti/j721e/evm.c
> @@ -531,10 +531,8 @@ err_free_gpio:
>   
>   void spl_board_init(void)
>   {
> -#if defined(CONFIG_ESM_K3) || defined(CONFIG_ESM_PMIC)
>   	struct udevice *dev;
>   	int ret;
> -#endif
>   
>   	if ((IS_ENABLED(CONFIG_TARGET_J721E_A72_EVM) ||
>   	     IS_ENABLED(CONFIG_TARGET_J7200_A72_EVM)) &&
> @@ -543,24 +541,20 @@ void spl_board_init(void)
>   			probe_daughtercards();
>   	}
>   
> -#ifdef CONFIG_ESM_K3
> -	if (board_ti_k3_is("J721EX-PM2-SOM")) {
> +	if (IS_ENABLED(CONFIG_ESM_K3)) {
>   		ret = uclass_get_device_by_driver(UCLASS_MISC,
>   						  DM_DRIVER_GET(k3_esm), &dev);
>   		if (ret)
>   			printf("ESM init failed: %d\n", ret);
>   	}

Nothing related to this patch, but to get esm completely functional

Second k3_esm probing needs to be added in this file.


Also, DT changes are needed, in next sync

https://lore.kernel.org/all/20231013102941.548209-1-n-francis@ti.com/


> -#endif
>   
> -#ifdef CONFIG_ESM_PMIC
> -	if (board_ti_k3_is("J721EX-PM2-SOM")) {
> +	if (IS_ENABLED(CONFIG_ESM_PMIC)) {
>   		ret = uclass_get_device_by_driver(UCLASS_MISC,
>   						  DM_DRIVER_GET(pmic_esm),
>   						  &dev);
>   		if (ret)
>   			printf("ESM PMIC init failed: %d\n", ret);
>   	}
> -#endif
>   	if ((IS_ENABLED(CONFIG_TARGET_J7200_A72_EVM) || IS_ENABLED(CONFIG_TARGET_J721E_A72_EVM)) &&
>   	    IS_ENABLED(CONFIG_HBMC_AM654)) {
>   		struct udevice *dev;