| Message ID | 20191112191521.11541-11-bob.beckett@collabora.com |
|---|---|
| State | Accepted |
| Commit | 7915e150d6d070172f5e280373c7955d69012f16 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | GE boards initial DM conversion | expand |
On Tue, 12 Nov 2019 at 12:16, Robert Beckett <bob.beckett@collabora.com> wrote: > > Enable DM imx WDT > Enable SYSRESET_WATCHDOG to maintain WDT based reset ability > > Signed-off-by: Robert Beckett <bob.beckett@collabora.com> > --- > > arch/arm/dts/imx53-ppd-uboot.dtsi | 12 ++++++++++++ > arch/arm/dts/imx53-ppd.dts | 1 + > board/ge/mx53ppd/mx53ppd.c | 1 - > configs/mx53ppd_defconfig | 3 +++ > 4 files changed, 16 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/imx53-ppd-uboot.dtsi Reviewed-by: Simon Glass <sjg@chromium.org>
> Enable DM imx WDT > Enable SYSRESET_WATCHDOG to maintain WDT based reset ability > Signed-off-by: Robert Beckett <bob.beckett@collabora.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-imx, -next, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/dts/imx53-ppd-uboot.dtsi b/arch/arm/dts/imx53-ppd-uboot.dtsi new file mode 100644 index 0000000000..88dd7e2939 --- /dev/null +++ b/arch/arm/dts/imx53-ppd-uboot.dtsi @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ OR X11 +/* + * Copyright 2019 Collabora Ltd + * Copyright 2019 General Electric Company + */ + +/ { + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + }; +}; diff --git a/arch/arm/dts/imx53-ppd.dts b/arch/arm/dts/imx53-ppd.dts index 8f3864998c..ae98361f9a 100644 --- a/arch/arm/dts/imx53-ppd.dts +++ b/arch/arm/dts/imx53-ppd.dts @@ -43,6 +43,7 @@ /dts-v1/; #include "imx53.dtsi" +#include "imx53-ppd-uboot.dtsi" #include <dt-bindings/input/input.h> / { diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c index b4d08a11ee..ad37995624 100644 --- a/board/ge/mx53ppd/mx53ppd.c +++ b/board/ge/mx53ppd/mx53ppd.c @@ -296,7 +296,6 @@ int board_late_init(void) return res; print_cpuinfo(); - hw_watchdog_init(); check_time(); diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index e1992e91ad..8822b74864 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -52,5 +52,8 @@ CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_WATCHDOG_TIMEOUT_MSECS=8000 CONFIG_IMX_WATCHDOG=y +CONFIG_WDT=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_DM_REGULATOR=y CONFIG_DM_USB=y
Enable DM imx WDT Enable SYSRESET_WATCHDOG to maintain WDT based reset ability Signed-off-by: Robert Beckett <bob.beckett@collabora.com> --- arch/arm/dts/imx53-ppd-uboot.dtsi | 12 ++++++++++++ arch/arm/dts/imx53-ppd.dts | 1 + board/ge/mx53ppd/mx53ppd.c | 1 - configs/mx53ppd_defconfig | 3 +++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx53-ppd-uboot.dtsi