From 480f6531ab71a0a6516ef0066f23e2567db4fb94 Mon Sep 17 00:00:00 2001 From: Neha Malcom Francis Date: Mon, 18 Nov 2024 16:27:10 +0530 Subject: arm: dts: k3-j784s4-r5: Add VTM node to R5 stage Add VTM node to R5 boot stage so that AVS gets correctly configured for J784S4 EVM and AM69 SK. Signed-off-by: Neha Malcom Francis Reviewed-by: Manorit Chawdhry --- arch/arm/dts/k3-j784s4-r5.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/dts/k3-j784s4-r5.dtsi b/arch/arm/dts/k3-j784s4-r5.dtsi index 0cd0ccc2dea..8bd863e8fcb 100644 --- a/arch/arm/dts/k3-j784s4-r5.dtsi +++ b/arch/arm/dts/k3-j784s4-r5.dtsi @@ -104,3 +104,9 @@ &mcu_udmap { ti,sci = <&dm_tifs>; }; + +&wkup_vtm0 { + bootph-pre-ram; + vdd-supply-2 = <&tps62873a>; +}; + -- cgit v1.3.1 From d43d612469cdd376593cba89c3910547fa613daa Mon Sep 17 00:00:00 2001 From: Neha Malcom Francis Date: Mon, 18 Nov 2024 16:27:11 +0530 Subject: arm: dts: k3-am68-sk-r5-base-board: Add VTM node to R5 stage Add the VTM node to the R5 boot stage so that AVS is correctly configured for AM68 SK. Signed-off-by: Neha Malcom Francis Reviewed-by: Manorit Chawdhry --- arch/arm/dts/k3-am68-sk-r5-base-board.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/dts/k3-am68-sk-r5-base-board.dts b/arch/arm/dts/k3-am68-sk-r5-base-board.dts index 3b2d7af2e52..b61d22b3b4b 100644 --- a/arch/arm/dts/k3-am68-sk-r5-base-board.dts +++ b/arch/arm/dts/k3-am68-sk-r5-base-board.dts @@ -10,3 +10,8 @@ #include "k3-j721s2-ddr.dtsi" #include "k3-am68-sk-base-board-u-boot.dtsi" #include "k3-j721s2-r5.dtsi" + +&wkup_vtm0 { + bootph-pre-ram; + vdd-supply-2 = <&tps62873a>; +}; -- cgit v1.3.1 From 6f6192f626302739f2d5d6115467f3296301bcd3 Mon Sep 17 00:00:00 2001 From: Neha Malcom Francis Date: Mon, 18 Nov 2024 16:27:12 +0530 Subject: arch: arm: mach-k3: j784s4_init: Probe AVS driver Probe the AVS driver to set the AVS voltage. Signed-off-by: Neha Malcom Francis Reviewed-by: Manorit Chawdhry --- arch/arm/mach-k3/j784s4/j784s4_init.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-k3/j784s4/j784s4_init.c b/arch/arm/mach-k3/j784s4/j784s4_init.c index 07b5d7d7504..8a41cd3bb50 100644 --- a/arch/arm/mach-k3/j784s4/j784s4_init.c +++ b/arch/arm/mach-k3/j784s4/j784s4_init.c @@ -233,9 +233,19 @@ void k3_mem_init(void) void board_init_f(ulong dummy) { + struct udevice *dev; + int ret; + k3_spl_init(); k3_mem_init(); + if (IS_ENABLED(CONFIG_CPU_V7R) && 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); + } + if (IS_ENABLED(CONFIG_CPU_V7R)) setup_navss_nb(); -- cgit v1.3.1 From 368bb089983525f49bb5c8375464216a545d4a1a Mon Sep 17 00:00:00 2001 From: Neha Malcom Francis Date: Mon, 18 Nov 2024 16:27:13 +0530 Subject: configs: j784s4_evm_r5_defconfig: Enable AVS Enable AVS support on J784S4 along with regulator. Signed-off-by: Neha Malcom Francis Reviewed-by: Manorit Chawdhry --- configs/j784s4_evm_r5_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/j784s4_evm_r5_defconfig b/configs/j784s4_evm_r5_defconfig index 0b5441fa023..0a55f75bbe5 100644 --- a/configs/j784s4_evm_r5_defconfig +++ b/configs/j784s4_evm_r5_defconfig @@ -145,3 +145,7 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 CONFIG_PANIC_HANG=y CONFIG_LIB_RATIONAL=y CONFIG_SPL_LIB_RATIONAL=y +CONFIG_K3_AVS0=y +CONFIG_DM_REGULATOR=y +CONFIG_SPL_DM_REGULATOR=y +CONFIG_SPL_DM_REGULATOR_TPS6287X=y -- cgit v1.3.1 From 45ebc1b90207c237392834bf8e39027195d9e948 Mon Sep 17 00:00:00 2001 From: Udit Kumar Date: Mon, 18 Nov 2024 16:27:14 +0530 Subject: configs: am68_sk_r5: Add AVS Configs Add AVS and PMIC regulator configs Signed-off-by: Udit Kumar Reviewed-by: Manorit Chawdhry --- configs/am68_sk_r5_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/am68_sk_r5_defconfig b/configs/am68_sk_r5_defconfig index f4800ef1b8a..81fa58743da 100644 --- a/configs/am68_sk_r5_defconfig +++ b/configs/am68_sk_r5_defconfig @@ -5,10 +5,11 @@ CONFIG_ARCH_K3=y CONFIG_SOC_K3_J721S2=y CONFIG_TARGET_J721S2_R5_EVM=y -CONFIG_K3_AVS0=n CONFIG_DM_REGULATOR_TPS65941=n CONFIG_PMIC_TPS65941=n +CONFIG_SPL_DM_REGULATOR_TPS6287X=y + CONFIG_DEFAULT_DEVICE_TREE="k3-am68-sk-r5-base-board" CONFIG_SPL_OF_LIST="k3-am68-sk-r5-base-board" CONFIG_OF_LIST="k3-am68-sk-r5-base-board" -- cgit v1.3.1