arm: socfpga: Use DM watchdog timer
Subsystems (3)
PATCH 1/1 arm: socfpga: Use DM watchdog timer
All SoCFPGA platforms (except Cyclone V) are now switching to CONFIG_WDT (driver model for watchdog timer drivers) from CONFIG_HW_WATCHDOG.
--- arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 4 ++++ arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi | 4 ++++ arch/arm/dts/socfpga_stratix10.dtsi | 1 - arch/arm/dts/socfpga_stratix10_socdk.dts | 4 ++++ arch/arm/mach-socfpga/spl_agilex.c | 2 +- arch/arm/mach-socfpga/spl_s10.c | 2 +- configs/socfpga_agilex_defconfig | 2 ++ 7 files changed, 16 insertions(+), 3 deletions(-)
arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi +4 -0
@@ -40,3 +40,7 @@ &qspi { status = "okay"; }; + +&watchdog0 { + u-boot,dm-pre-reloc; +};
arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi +4 -0
@@ -15,3 +15,7 @@ &uart1 { u-boot,dm-pre-reloc; }; + +&watchdog1 { + u-boot,dm-pre-reloc; +};
arch/arm/dts/socfpga_stratix10.dtsi +0 -1
@@ -386,7 +386,6 @@ reg = <0xffd00200 0x100>; interrupts = <0 117 4>; resets = <&rst WATCHDOG0_RESET>; - u-boot,dm-pre-reloc; status = "disabled"; };
arch/arm/dts/socfpga_stratix10_socdk.dts +4 -0
@@ -137,3 +137,7 @@ &usb0 { status = "okay"; }; + +&watchdog0 { + status = "okay"; +};
arch/arm/mach-socfpga/spl_agilex.c +1 -1
@@ -51,11 +51,11 @@ void board_init_f(ulong dummy)socfpga_get_managers_addr (); -#ifdef CONFIG_HW_WATCHDOG /* Ensure watchdog is paused when debugging is happening */ writel (SYSMGR_WDDBG_PAUSE_ALL_CPU ,socfpga_get_sysmgr_addr () +SYSMGR_SOC64_WDDBG ); +#ifdef CONFIG_HW_WATCHDOG /* Enable watchdog before initializing the HW */ socfpga_per_reset (SOCFPGA_RESET (L4WD0 ),1 );socfpga_per_reset (SOCFPGA_RESET (L4WD0 ),0 );
arch/arm/mach-socfpga/spl_s10.c +1 -1
@@ -53,11 +53,11 @@ void board_init_f(ulong dummy)socfpga_get_managers_addr (); -#ifdef CONFIG_HW_WATCHDOG /* Ensure watchdog is paused when debugging is happening */ writel (SYSMGR_WDDBG_PAUSE_ALL_CPU ,socfpga_get_sysmgr_addr () +SYSMGR_SOC64_WDDBG ); +#ifdef CONFIG_HW_WATCHDOG /* Enable watchdog before initializing the HW */ socfpga_per_reset (SOCFPGA_RESET (L4WD0 ),1 );socfpga_per_reset (SOCFPGA_RESET (L4WD0 ),0 );
configs/socfpga_agilex_defconfig +2 -0
@@ -60,4 +60,6 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_DESIGNWARE_WATCHDOG=y +CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set
Signature · 1 line
2.2.0
Tan
PATCH 1/1 arm: socfpga: Use DM watchdog timer
Quoted 74 lines
-----Original Message-----
From: Ang, Chee Hong <[email protected]>
Sent: Wednesday, August 5, 2020 9:51 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Simon Goldschmidt <[email protected]>; Tom Rini <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Ang, Chee Hong <[email protected]>; Chee, Tien Fong <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [PATCH v1] arm: socfpga: Use DM watchdog timerAll SoCFPGA platforms (except Cyclone V) are now switching to
CONFIG_WDT(driver model for watchdog timer drivers) fromCONFIG_HW_WATCHDOG.Signed-off-by Chee Hong Ang <[email protected]>--- arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 4 ++++ arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi | 4 ++++ arch/arm/dts/socfpga_stratix10.dtsi | 1 - arch/arm/dts/socfpga_stratix10_socdk.dts | 4 ++++ arch/arm/mach-socfpga/spl_agilex.c | 2 +- arch/arm/mach-socfpga/spl_s10.c | 2 +- configs/socfpga_agilex_defconfig | 2 ++ 7 files changed, 16 insertions(+), 3 deletions(-)arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi +4
-0@@ -40,3 +40,7 @@ &qspi { status = "okay"; }; + +&watchdog0 { + u-boot,dm-pre-reloc; +};arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi +4
-0@@ -15,3 +15,7 @@ &uart1 { u-boot,dm-pre-reloc; }; + +&watchdog1 { + u-boot,dm-pre-reloc; +};arch/arm/dts/socfpga_stratix10.dtsi +0
-1@@ -386,7 +386,6 @@ reg = <0xffd00200 0x100>; interrupts = <0 117 4>; resets = <&rst WATCHDOG0_RESET>; - u-boot,dm-pre-reloc; status = "disabled"; };arch/arm/dts/socfpga_stratix10_socdk.dts +0
-0
arch/arm/dts/socfpga_stratix10_socdk.dts line 143
Quoted 7 lines
arch/arm/dts/socfpga_stratix10_socdk.dts +4
-0@@ -137,3 +137,7 @@ &usb0 { status = "okay"; }; + +&watchdog0 { + status = "okay"; +};
Try not to modify socfpga_stratix10_socdk.dts , move this to socfpga_stratix10_socdk-u-boot.dtsi.
Regards
Ley Foon