Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell into next

- Handling all DM watchdogs in watchdog_reset() (Rasmus)
2021-08-31 19:11:15 -04:00
parent df6cf3d809 4171c57472
commit e2e5eec6ce
12 changed files with 354 additions and 66 deletions
--- 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 {