| Message ID | 20200611145117.2936-1-patrick.delaunay@st.com |
|---|---|
| State | Accepted |
| Commit | 2ee5005dea1a12bba096abac1f8ebeaea91bf964 |
| Delegated to: | Patrick Delaunay |
| Headers | show |
| Series | configs: stm32mp1: activate WATCHDOG | expand |
Hi Patrick On 6/11/20 4:51 PM, Patrick Delaunay wrote: > As kernel v5.6 have a solution since so we will be able to enable > the watchdog at boot time. It is reloaded by the watchdog > framework (if CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set) and > until the userspace watchdog daemon takes over control. > > Need presence of kernel patch 85fdc63fe256 ("drivers: watchdog: > stm32_iwdg: set WDOG_HW_RUNNING at probe") integrated in v5.6-rc1. > > This patch revert the previous commit ca351e705a5c ("stm32mp1: > deactivate WATCHDOG in defconfig"). > > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> > --- > > configs/stm32mp15_basic_defconfig | 2 ++ > configs/stm32mp15_trusted_defconfig | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig > index c7dd2926c9..a3b6c381d2 100644 > --- a/configs/stm32mp15_basic_defconfig > +++ b/configs/stm32mp15_basic_defconfig > @@ -140,5 +140,7 @@ CONFIG_VIDEO_STM32=y > CONFIG_VIDEO_STM32_DSI=y > CONFIG_VIDEO_STM32_MAX_XRES=1280 > CONFIG_VIDEO_STM32_MAX_YRES=800 > +CONFIG_WDT=y > +CONFIG_WDT_STM32MP=y > CONFIG_ERRNO_STR=y > CONFIG_FDT_FIXUP_PARTITIONS=y > diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig > index ca4a10813b..cf5ad916e7 100644 > --- a/configs/stm32mp15_trusted_defconfig > +++ b/configs/stm32mp15_trusted_defconfig > @@ -127,5 +127,7 @@ CONFIG_VIDEO_STM32=y > CONFIG_VIDEO_STM32_DSI=y > CONFIG_VIDEO_STM32_MAX_XRES=1280 > CONFIG_VIDEO_STM32_MAX_YRES=800 > +CONFIG_WDT=y > +CONFIG_WDT_STM32MP=y > CONFIG_ERRNO_STR=y > CONFIG_FDT_FIXUP_PARTITIONS=y Reviewed-by: Patrice Chotard <patrice.chotard@st.com> Thanks
diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index c7dd2926c9..a3b6c381d2 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -140,5 +140,7 @@ CONFIG_VIDEO_STM32=y CONFIG_VIDEO_STM32_DSI=y CONFIG_VIDEO_STM32_MAX_XRES=1280 CONFIG_VIDEO_STM32_MAX_YRES=800 +CONFIG_WDT=y +CONFIG_WDT_STM32MP=y CONFIG_ERRNO_STR=y CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index ca4a10813b..cf5ad916e7 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -127,5 +127,7 @@ CONFIG_VIDEO_STM32=y CONFIG_VIDEO_STM32_DSI=y CONFIG_VIDEO_STM32_MAX_XRES=1280 CONFIG_VIDEO_STM32_MAX_YRES=800 +CONFIG_WDT=y +CONFIG_WDT_STM32MP=y CONFIG_ERRNO_STR=y CONFIG_FDT_FIXUP_PARTITIONS=y
As kernel v5.6 have a solution since so we will be able to enable the watchdog at boot time. It is reloaded by the watchdog framework (if CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set) and until the userspace watchdog daemon takes over control. Need presence of kernel patch 85fdc63fe256 ("drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe") integrated in v5.6-rc1. This patch revert the previous commit ca351e705a5c ("stm32mp1: deactivate WATCHDOG in defconfig"). Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> --- configs/stm32mp15_basic_defconfig | 2 ++ configs/stm32mp15_trusted_defconfig | 2 ++ 2 files changed, 4 insertions(+)