summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-31 19:11:15 -0400
committerTom Rini <trini@konsulko.com>2021-08-31 19:11:15 -0400
commite2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a (patch)
treea7f70892693eb02a9e23529c8ded4aea98af64a1 /arch
parentdf6cf3d809fe543651e6bdf133baaa8b9841fe0f (diff)
parent4171c574721f3790b416b57d6a536cf3238d5849 (diff)
downloadu-boot-e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a.tar.gz
u-boot-e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a.tar.bz2
u-boot-e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a.zip
Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell into next
- Handling all DM watchdogs in watchdog_reset() (Rasmus)
Diffstat (limited to 'arch')
-rw-r--r--arch/sandbox/dts/test.dts8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 962bdbe556..1399a14929 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -793,6 +793,13 @@
};
};
+ gpio-wdt {
+ gpios = <&gpio_a 7 0>;
+ compatible = "linux,wdt-gpio";
+ hw_margin_ms = <100>;
+ always-running;
+ };
+
mbox: mbox {
compatible = "sandbox,mbox";
#mbox-cells = <1>;
@@ -1272,6 +1279,7 @@
wdt0: wdt@0 {
compatible = "sandbox,wdt";
+ hw_margin_ms = <200>;
};
axi: axi@0 {