From 961523fce0eb77c0266e59a60e89a0d4aee1173b Mon Sep 17 00:00:00 2001 From: Jack Cai Date: Fri, 21 Aug 2026 21:54:12 +0000 Subject: [PATCH] Update Nexthop DTS patch: - Enable CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED so the kernel watchdog core keeps feeding a boot-enabled WDT until userspace opens it - Add aspeed,reset-type = "soc" on wdt0 and watchdog0/1 aliases to the nexthop-b27-r0 device tree patch Signed-off-by: Jack Cai --- config.local/arm64/config.sonic-aspeed | 1 + patches-sonic/nexthop-b27-dts.patch | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/config.local/arm64/config.sonic-aspeed b/config.local/arm64/config.sonic-aspeed index d50c8eb16..1fcc8fb02 100644 --- a/config.local/arm64/config.sonic-aspeed +++ b/config.local/arm64/config.sonic-aspeed @@ -34,6 +34,7 @@ CONFIG_SENSORS_ASPEED=y CONFIG_SENSORS_ASPEED_G6=m CONFIG_SENSORS_ASPEED_CHASSIS=m CONFIG_ASPEED_WATCHDOG=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y CONFIG_MEDIA_SUPPORT=m CONFIG_VIDEO_DEV=m CONFIG_DVB_CORE=m diff --git a/patches-sonic/nexthop-b27-dts.patch b/patches-sonic/nexthop-b27-dts.patch index eef9956a7..4df499d98 100644 --- a/patches-sonic/nexthop-b27-dts.patch +++ b/patches-sonic/nexthop-b27-dts.patch @@ -14,8 +14,8 @@ The device tree is based on ast2700-evb.dts with modifications for production hardware that does not have PHY chips. --- arch/arm64/boot/dts/aspeed/Makefile | 1 + - arch/arm64/boot/dts/aspeed/nexthop-b27-r0.dts | 938 ++++++++++++++++++ - 2 files changed, 939 insertions(+) + arch/arm64/boot/dts/aspeed/nexthop-b27-r0.dts | 946 ++++++++++++++++++ + 2 files changed, 947 insertions(+) create mode 100644 arch/arm64/boot/dts/aspeed/nexthop-b27-r0.dts diff --git a/arch/arm64/boot/dts/aspeed/Makefile b/arch/arm64/boot/dts/aspeed/Makefile @@ -32,10 +32,10 @@ index 4458a1b..1b26168 100644 ast2700-evb-s1.dtb \ diff --git a/arch/arm64/boot/dts/aspeed/nexthop-b27-r0.dts b/arch/arm64/boot/dts/aspeed/nexthop-b27-r0.dts new file mode 100644 -index 0000000..edad94f +index 0000000..84d092e --- /dev/null +++ b/arch/arm64/boot/dts/aspeed/nexthop-b27-r0.dts -@@ -0,0 +1,938 @@ +@@ -0,0 +1,946 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// +// NextHop AST2700 based B27 R0 Device Tree @@ -964,12 +964,20 @@ index 0000000..edad94f +#endif +&wdt0 { + status = "okay"; ++ aspeed,reset-type = "soc"; +}; + +&wdt1 { + status = "okay"; +}; + ++/ { ++ aliases { ++ watchdog0 = &wdt0; ++ watchdog1 = &wdt1; ++ }; ++}; ++ +&otp { + status = "okay"; +};