summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUdit Kumar <u-kumar1@ti.com>2024-02-15 23:15:42 +0530
committerFrancesco Dolcini <francesco.dolcini@toradex.com>2024-03-21 14:26:33 +0000
commitb106fec8625e6e8fa4b426c1a586cb145b0b5e1d (patch)
treeb2ebac5991791dfa3b7caaab8b959607168332c9
parenta5731ef9d6b610f3f8a075e60958aa07a36ac31e (diff)
board: ti: j721s2: Move order of AVS probing
AVS driver was getting probed with base device tree, which leads i2c of derivative board (AM68) in bad state. Moving AVS probe after detection of right device tree. Fixes: eaa184009775 ("arm: k3: j721s2: Enable AVS") Reported-by: Minas Hambardzumyan <minas@ti.com> Cc: Manorit Chawdhry <m-chawdhry@ti.com> Cc: Vignesh Raghavendra <vigneshr@ti.com> Cc: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Udit Kumar <u-kumar1@ti.com>
-rw-r--r--arch/arm/mach-k3/j721s2_init.c6
-rw-r--r--board/ti/j721s2/evm.c9
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/mach-k3/j721s2_init.c b/arch/arm/mach-k3/j721s2_init.c
index 7818f5121b..680123e8af 100644
--- a/arch/arm/mach-k3/j721s2_init.c
+++ b/arch/arm/mach-k3/j721s2_init.c
@@ -208,12 +208,6 @@ void k3_spl_init(void)
/* Output System Firmware version info */
k3_sysfw_print_ver();
- if (IS_ENABLED(CONFIG_K3_AVS0)) {
- ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(k3_avs),
- &dev);
- if (ret)
- printf("AVS init failed: %d\n", ret);
- }
}
bool check_rom_loaded_sysfw(void)
diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
index 3847587961..1bde20a17d 100644
--- a/board/ti/j721s2/evm.c
+++ b/board/ti/j721s2/evm.c
@@ -447,10 +447,19 @@ void do_dt_magic(void)
#ifdef CONFIG_SPL_BUILD
void board_init_f(ulong dummy)
{
+ struct udevice *dev;
+ int ret;
k3_spl_init();
#if defined(CONFIG_SPL_OF_LIST) && defined(CONFIG_TI_I2C_BOARD_DETECT)
do_dt_magic();
#endif
k3_mem_init();
+
+ if (IS_ENABLED(CONFIG_K3_AVS0) && board_is_j721s2_som()) {
+ ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(k3_avs),
+ &dev);
+ if (ret)
+ printf("AVS init failed: %d\n", ret);
+ }
}
#endif