From d672e15aa87a5a5debefe7b8fcdae5619e3371b0 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Sat, 4 Nov 2023 02:21:40 -0500 Subject: [PATCH] board: ti: j721e: evm: Drop board check for ESM When config is enabled, the esm dt probe makes sense. Simplify by dropping board specific checks. Signed-off-by: Nishanth Menon Reviewed-by: Neha Malcom Francis --- 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 d6a461d9d7..f7ab15f1d7 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -522,10 +522,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)) && @@ -534,24 +532,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); } -#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; -- 2.39.5