[PATCH v7 5/5] iot2050: Enable watchdog support, but do not auto-start it

Jan Kiszka
2021-08-03T14:24:46Z

From: Jan Kiszka <jan.kiszka@siemens.com>

This allows to use the watchdog in custom scripts but does not enforce
that the OS has to support it as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 16 ++++++++++++++++
configs/iot2050_defconfig | 6 ++++++
2 files changed, 22 insertions(+)

diff --git a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
index 61745c6c23..8e3f1709e9 100644
--- a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
+++ b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
@@ -59,6 +59,16 @@
filename = "arch/arm/dts/k3-am6548-iot2050-advanced.dtb";
};
};
+
+#ifdef CONFIG_WDT_K3_RTI_FW_FILE
+ k3-rti-wdt-firmware {
+ type = "blob";
+ load = <0x82000000>;
+ blob {
+ filename = CONFIG_WDT_K3_RTI_FW_FILE;
+ };
+ };
+#endif
};

configurations {
@@ -68,12 +78,18 @@
description = "iot2050-basic";
firmware = "u-boot";
fdt = "fdt-iot2050-basic";
+#ifdef CONFIG_WDT_K3_RTI_FW_FILE
+ loadables = "k3-rti-wdt-firmware";
+#endif
};

conf-iot2050-advanced {
description = "iot2050-advanced";
firmware = "u-boot";
fdt = "fdt-iot2050-advanced";
+#ifdef CONFIG_WDT_K3_RTI_FW_FILE
+ loadables = "k3-rti-wdt-firmware";
+#endif
};
};
};
diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig
index 6af8971aa5..b30483f73b 100644
--- a/configs/iot2050_defconfig
+++ b/configs/iot2050_defconfig
@@ -51,6 +51,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_PCI=y
CONFIG_CMD_REMOTEPROC=y
CONFIG_CMD_USB=y
+CONFIG_CMD_WDT=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TIME=y
# CONFIG_ISO_PARTITION is not set
@@ -129,4 +130,9 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_KEYBOARD=y
+# CONFIG_WATCHDOG is not set
+# CONFIG_WATCHDOG_AUTOSTART is not set
+CONFIG_WDT=y
+CONFIG_WDT_K3_RTI=y
+CONFIG_WDT_K3_RTI_LOAD_FW=y
CONFIG_OF_LIBFDT_OVERLAY=y
--
2.31.1