> -----Original Message-----
> From: Ang, Chee Hong <[email protected]>
> Sent: Wednesday, August 5, 2020 9:51 PM
> To: [email protected]
> 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 timer
>
> All SoCFPGA platforms (except Cyclone V) are now switching to
> CONFIG_WDT (driver model for watchdog timer drivers) from
> CONFIG_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(-)
>
> diff --git a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
> b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
> index debeb8b..6cac36a 100644
> --- a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
> +++ b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
> @@ -40,3 +40,7 @@
> &qspi {
> status = "okay";
> };
> +
> +&watchdog0 {
> + u-boot,dm-pre-reloc;
> +};
> diff --git a/arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi
> b/arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi
> index 58cd497..22e614d 100644
> --- a/arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi
> +++ b/arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi
> @@ -15,3 +15,7 @@
> &uart1 {
> u-boot,dm-pre-reloc;
> };
> +
> +&watchdog1 {
> + u-boot,dm-pre-reloc;
> +};
> diff --git a/arch/arm/dts/socfpga_stratix10.dtsi
> b/arch/arm/dts/socfpga_stratix10.dtsi
> index a8e61cf..cb799bc 100755
> --- a/arch/arm/dts/socfpga_stratix10.dtsi
> +++ b/arch/arm/dts/socfpga_stratix10.dtsi
> @@ -386,7 +386,6 @@
> reg = <0xffd00200 0x100>;
> interrupts = <0 117 4>;
> resets = <&rst WATCHDOG0_RESET>;
> - u-boot,dm-pre-reloc;
> status = "disabled";
> };
>
> diff --git a/arch/arm/dts/socfpga_stratix10_socdk.dts
> b/arch/arm/dts/socfpga_stratix10_socdk.dts
> index b7b48a5..fceae93 100755
> --- a/arch/arm/dts/socfpga_stratix10_socdk.dts
> +++ b/arch/arm/dts/socfpga_stratix10_socdk.dts
> @@ -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
