UPSTREAM-PEND: drivers: watchdog: wdt_ti_rti: Add rti-mode property for reset or NMI

boards/ti/am62l_evm/am62l_evm_am62l3_a53.dts

@@ -23,6 +23,7 @@
 
 	aliases {
 		led0 = &ld9;
+		watchdog0 = &main_rti0;
 	};
 
 	leds: leds {
@@ -197,3 +198,7 @@
 		ngpios = <24>;
 	};
 };
+
+&main_rti0 {
+	status = "okay";
+};

drivers/watchdog/wdt_ti_rti.c

@@ -71,6 +71,8 @@ struct wdt_ti_rti_config {
 	DEVICE_MMIO_ROM;
 
 	uint64_t freq;
+	bool nmi_supported;
+	bool reset_supported;
 	void (*irq_config_func)(void);
 };
 
@@ -146,8 +148,17 @@ static int wdt_ti_rti_timeout(const struct device *dev, const struct wdt_timeout
 		return -EINVAL;
 	}
 
-	/* Only NMI is supported */
 	if (cfg->flags == WDT_FLAG_RESET_SOC) {
+		/* Reset mode requested */
+		if (!config->reset_supported) {
+			return -ENOTSUP;
+		}
+		regs->WWDRXNCTRL = RTIWWDRX_RESET;
+	} else {
+		/* NMI mode requested */
+		if (!config->nmi_supported) {
+			return -ENOTSUP;
+		}
 		regs->WWDRXNCTRL = RTIWWDRX_NMI;
 	}
 
@@ -171,6 +182,7 @@ static int wdt_ti_rti_feed(const struct device *dev, int channel_id)
 	return 0;
 }
 
+#if DT_ANY_INST_HAS_PROP_STATUS_OKAY(interrupts)
 static void wdt_ti_rti_isr(const struct device *dev)
 {
 	struct wdt_ti_rti_data *data = DEV_DATA(dev);
@@ -184,6 +196,7 @@ static void wdt_ti_rti_isr(const struct device *dev)
 	regs->WDKEY = WDKEY_SEQ0;
 	regs->WDKEY = WDKEY_SEQ1;
 }
+#endif
 
 static int wdt_ti_rti_init(const struct device *dev)
 {
@@ -197,7 +210,9 @@ static int wdt_ti_rti_init(const struct device *dev)
 		return -EINVAL;
 	}
 
-	config->irq_config_func();
+	if (config->nmi_supported) {
+		config->irq_config_func();
+	}
 	return 0;
 }
 
@@ -211,15 +226,19 @@ static DEVICE_API(wdt, wdt_ti_rti_api) = {
 #define WDT_TI_RTI_INIT(i)                                                                         \
 	static void wdt_ti_rti_irq_config_##i(void)                                                \
 	{                                                                                          \
-		IRQ_CONNECT(DT_INST_IRQN(i), DT_INST_IRQ(i, priority), wdt_ti_rti_isr,             \
-			    DEVICE_DT_INST_GET(i), 0);                                             \
-		irq_enable(DT_INST_IRQN(i));                                                       \
+		IF_ENABLED(DT_INST_IRQ_HAS_IDX(i, 0), (						   \
+			IRQ_CONNECT(DT_INST_IRQN(i), DT_INST_IRQ(i, priority), wdt_ti_rti_isr,     \
+				DEVICE_DT_INST_GET(i), 0);                                         \
+			irq_enable(DT_INST_IRQN(i));                                               \
+		));										   \
 	};                                                                                         \
 	static struct wdt_ti_rti_data wdt_ti_rti_data_##i = {};                                    \
                                                                                                    \
 	static struct wdt_ti_rti_config wdt_ti_rti_config_##i = {                                  \
 		DEVICE_MMIO_ROM_INIT(DT_DRV_INST(i)),                                              \
 		.freq = DT_INST_PROP(i, clock_frequency),                                          \
+		.nmi_supported = DT_INST_IRQ_HAS_IDX(i, 0),					   \
+		.reset_supported = DT_INST_PROP(i, reset_capable),				   \
 		.irq_config_func = wdt_ti_rti_irq_config_##i,                                      \
 	};                                                                                         \
                                                                                                    \

dts/bindings/watchdog/ti,j7-rti-wdt.yaml

@@ -14,3 +14,16 @@ properties:
   clock-frequency:
     type: int
     required: true
+
+  interrupts:
+    description:
+      Watchdog interrupt line, if present NMI mode is supported.
+
+  reset-capable:
+    type: boolean
+    description:
+      Indicates reset mode is supported by hardware.
+      If set, watchdog timeout will trigger a reset.
+      The SoC can only be configured for either NMI
+      or Reset mode at a time. Support for NMI or Reset is SoC
+      specific.

dts/vendor/ti/am62l-main.dtsi

@@ -239,13 +239,17 @@
 		compatible = "ti,j7-rti-wdt";
 		reg = <0x0e000000 0x100>;
 		clock-frequency = <DT_FREQ_M(25)>;
+		clocks = <&scmi_clk 277>;
+		reset-capable;
 		status = "disabled";
 	};
 
 	main_rti1: watchdog@e010000 {
 		compatible = "ti,j7-rti-wdt";
 		reg = <0x0e010000 0x100>;
 		clock-frequency = <DT_FREQ_M(25)>;
+		clocks = <&scmi_clk 283>;
+		reset-capable;
 		status = "disabled";
 	};