From 4bd61bd652d504a5a80f101a92f4ba9a2a651e4e Mon Sep 17 00:00:00 2001
From: snlavaise <snlavaise@gmail.com>
Date: Tue, 8 Sep 2026 15:10:26 -0300
Subject: [PATCH] linux-postmarketos-qcom-sm8550: add APSS watchdog node for
 rtwo

'fastboot boot' hands off cleanly (OKAY / booting) and the device then
resets - classic unpetted APSS watchdog. sm8550.dtsi at 6.13-rc3 has no
watchdog node; add it for rtwo so qcom_wdt binds and keeps it fed.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QF5HebjUsRaxbW4cBX6HJP
---
 .../linux-postmarketos-qcom-sm8550/APKBUILD      |  2 +-
 .../sm8550-motorola-rtwo.dts                     | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/device/testing/linux-postmarketos-qcom-sm8550/APKBUILD b/device/testing/linux-postmarketos-qcom-sm8550/APKBUILD
index e6fd79975..764165104 100644
--- a/device/testing/linux-postmarketos-qcom-sm8550/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sm8550/APKBUILD
@@ -108,6 +108,6 @@ package() {
 # 'pmbootstrap checksum linux-postmarketos-qcom-sm8550' (it downloads ~250 MB).
 sha512sums="
 19f6d0ee8481e34b0b8c27f07f3023182cda9e2a3d67e40989b1f300b7e82d7ea606fb112599dd9399e0d5f973d43b289d8932a4b578b6ffe4168af05e19f795  linux-postmarketos-qcom-sm8550-22591bbc21da5cc0c6e37503b77bd2d852fe241c.tar.gz
-71270b409e4fc5b6f5ddd164629c937e5ad783761c8a290d46d36a3ba21a96702c1861bfc20e0a1225b2af6d88d21333b5a9c82149f125ed42385c9c7dd207cf  sm8550-motorola-rtwo.dts
+02d8dc574f20027a4aace5238fa879bb2d305551f8583f2b5b37d5388ab9ba6c7337f6f2bb4e23ddb3d852a3195fb4cddfc9791e7c6a33e60bee552b028d101c  sm8550-motorola-rtwo.dts
 91cebe340d9e1a3f308725ced37d2f6c4695869100e198d693317f476b1123128b1b24a0604f4aa132d6269de68a87017485149df7d2924cf3a09241b999ffcf  rtwo.config
 "
diff --git a/device/testing/linux-postmarketos-qcom-sm8550/sm8550-motorola-rtwo.dts b/device/testing/linux-postmarketos-qcom-sm8550/sm8550-motorola-rtwo.dts
index 5a0006c0e..d54acac55 100644
--- a/device/testing/linux-postmarketos-qcom-sm8550/sm8550-motorola-rtwo.dts
+++ b/device/testing/linux-postmarketos-qcom-sm8550/sm8550-motorola-rtwo.dts
@@ -29,6 +29,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
@@ -120,6 +121,21 @@
 	};
 };
 
+&soc {
+	/*
+	 * APSS watchdog - not described in sm8550.dtsi (6.13-rc3). The Motorola
+	 * bootloader hands off with it armed; without this node nothing pets it
+	 * and the device resets ~30 s after the kernel starts. Binds via the
+	 * "qcom,kpss-wdt" fallback + CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED.
+	 */
+	watchdog@17c10000 {
+		compatible = "qcom,apss-wdt-sm8550", "qcom,kpss-wdt";
+		reg = <0x0 0x17c10000 0x0 0x1000>;
+		clocks = <&sleep_clk>;
+		interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
+	};
+};
+
 &apps_rsc {
 	/*
 	 * PM8550-family RPMh regulators. Rail voltage ranges are the SM8550