CI: https://github.com/u-boot/u-boot/pull/967/checks
The watchdog DT changes have already been posted to the upstream Linux kernel, addressing the concern about avoiding unnecessary growth of u-boot.dtsi. Linux DT changes are available at: https://lore.kernel.org/all/[email protected]/T/#u Changes for v2: - Iterate all watchdog nodes in device tree instead of wdog alias - Delete non-DM implementation of the ULP watchdog driver Changes for v3: - Convert imx7ulp, imx91, imx93-frdm and imx93_var_som to CONFIG_OF_UPSTREAM Signed-off-by: Alice Guo <[email protected]> --- Alice Guo (9): imx7ulp: Switch to OF_UPSTREAM imx91: Switch to OF_UPSTREAM imx93-frdm: Switch to OF_UPSTREAM imx93_var_som: Switch to OF_UPSTREAM imx: soc: Get watchdog base addresses from device tree arm: dts: imx: Update watchdog nodes for dynamic base address lookup watchdog: ulp_wdog: Use driver model for reset_cpu() arm: dts: imx: Enable watchdog driver model support imx: Remove hardcoded watchdog base address macros arch/arm/dts/Makefile | 4 - arch/arm/dts/imx7ulp-com-u-boot.dtsi | 2 + arch/arm/dts/imx7ulp-com.dts | 79 -- arch/arm/dts/imx7ulp-evk-u-boot.dtsi | 6 + arch/arm/dts/imx7ulp-evk.dts | 133 ---- arch/arm/dts/imx7ulp-u-boot.dtsi | 17 + arch/arm/dts/imx7ulp.dtsi | 461 ------------ arch/arm/dts/imx8ulp-evk-u-boot.dtsi | 4 - arch/arm/dts/imx8ulp-u-boot.dtsi | 4 + arch/arm/dts/imx91-11x11-evk.dts | 875 ---------------------- arch/arm/dts/imx91-11x11-frdm.dts | 773 ------------------- arch/arm/dts/imx91-pinfunc.h | 770 ------------------- arch/arm/dts/imx91-u-boot.dtsi | 12 + arch/arm/dts/imx91.dtsi | 53 -- arch/arm/dts/imx93-11x11-frdm.dts | 603 --------------- arch/arm/dts/imx93-u-boot.dtsi | 12 + arch/arm/dts/imx93-var-som-symphony.dts | 323 -------- arch/arm/dts/imx93-var-som.dtsi | 111 --- arch/arm/dts/imx93.dtsi | 906 ----------------------- arch/arm/dts/imx943-evk-u-boot.dtsi | 4 - arch/arm/dts/imx943-u-boot.dtsi | 19 + arch/arm/dts/imx95-15x15-evk-u-boot.dtsi | 4 - arch/arm/dts/imx95-19x19-evk-u-boot.dtsi | 4 - arch/arm/dts/imx95-toradex-smarc-dev-u-boot.dtsi | 4 - arch/arm/dts/imx95-u-boot.dtsi | 14 + arch/arm/dts/imx95-verdin-wifi-dev-u-boot.dtsi | 4 - arch/arm/dts/imx952-u-boot.dtsi | 14 + arch/arm/include/asm/arch-imx8ulp/imx-regs.h | 2 - arch/arm/include/asm/arch-imx9/imx-regs.h | 9 - arch/arm/mach-imx/imx8ulp/soc.c | 14 +- arch/arm/mach-imx/imx9/Kconfig | 4 + arch/arm/mach-imx/imx9/scmi/soc.c | 15 +- arch/arm/mach-imx/imx9/soc.c | 16 +- arch/arm/mach-imx/mx7ulp/Kconfig | 2 + arch/arm/mach-imx/mx7ulp/soc.c | 24 +- configs/imx8ulp_evk_defconfig | 1 + configs/imx91_11x11_evk_defconfig | 2 +- configs/imx91_11x11_evk_inline_ecc_defconfig | 2 +- configs/imx91_11x11_frdm_defconfig | 2 +- configs/imx93-phycore_defconfig | 1 + configs/imx93_frdm_defconfig | 2 +- configs/imx93_var_som_defconfig | 2 +- configs/imx943_evk_defconfig | 1 + configs/imx95_15x15_evk_defconfig | 1 + configs/imx95_evk.config | 1 + configs/mx7ulp_com_defconfig | 3 +- configs/mx7ulp_evk_defconfig | 2 +- configs/mx7ulp_evk_plugin_defconfig | 2 +- configs/toradex-smarc-imx95_defconfig | 1 + configs/verdin-imx95_defconfig | 1 + drivers/watchdog/ulp_wdog.c | 79 +- include/configs/imx8ulp_evk.h | 2 - include/configs/imx91_evk.h | 2 - include/configs/imx91_frdm.h | 2 - include/configs/imx93_evk.h | 3 - include/configs/imx93_frdm.h | 3 - include/configs/imx93_qsb.h | 2 - include/configs/imx93_var_som.h | 3 - include/configs/imx94_evk.h | 3 - include/configs/imx95_evk.h | 2 - include/configs/kontron-osm-s-mx93.h | 2 - include/configs/mx7ulp_com.h | 3 - include/configs/mx7ulp_evk.h | 3 - include/configs/phycore_imx91_93.h | 3 - include/configs/toradex-smarc-imx95.h | 2 - 65 files changed, 206 insertions(+), 5233 deletions(-) --- base-commit: 5732bd0f457b4c671e46574d64d4acb099c0f0a5 change-id: 20260512-wdt-dbbb375e9dba Best regards, -- Alice Guo <[email protected]>
