| Message ID | 184ed1978ac60625b3ca4caf853be05e9dcd112b.1571853833.git.bob.beckett@collabora.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | convert GE boards to DM | expand |
On Wed, Oct 23, 2019 at 3:22 PM 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/imx6q-bx50v3.dts | 4 ++++ > configs/ge_bx50v3_defconfig | 3 +++ > 2 files changed, 7 insertions(+) > > diff --git a/arch/arm/dts/imx6q-bx50v3.dts b/arch/arm/dts/imx6q-bx50v3.dts > index 28a35394f0..2e2e3bbc24 100644 > --- a/arch/arm/dts/imx6q-bx50v3.dts > +++ b/arch/arm/dts/imx6q-bx50v3.dts > @@ -18,6 +18,10 @@ > ethernet0 = &fec; > }; > > + wdt-reboot { > + compatible = "wdt-reboot"; > + wdt = <&wdog1>; > + }; > }; Looking at arch/arm/boot/dts/imx6q-bx50v3.dtsi from Linux, which includes arch/arm/boot/dts/imx6q-bx50v3.dtsi, the wdog definition is present: &wdog1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wdog>; fsl,ext-reset-output; }; So it would be better just use the same bindings in U-Boot without the need of deviating the device tree.
On Wed, 2019-10-23 at 17:33 -0300, Fabio Estevam wrote: > On Wed, Oct 23, 2019 at 3:22 PM 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/imx6q-bx50v3.dts | 4 ++++ > > configs/ge_bx50v3_defconfig | 3 +++ > > 2 files changed, 7 insertions(+) > > > > diff --git a/arch/arm/dts/imx6q-bx50v3.dts b/arch/arm/dts/imx6q- > > bx50v3.dts > > index 28a35394f0..2e2e3bbc24 100644 > > --- a/arch/arm/dts/imx6q-bx50v3.dts > > +++ b/arch/arm/dts/imx6q-bx50v3.dts > > @@ -18,6 +18,10 @@ > > ethernet0 = &fec; > > }; > > > > + wdt-reboot { > > + compatible = "wdt-reboot"; > > + wdt = <&wdog1>; > > + }; > > }; > > Looking at arch/arm/boot/dts/imx6q-bx50v3.dtsi from Linux, which > includes arch/arm/boot/dts/imx6q-bx50v3.dtsi, the wdog definition is > present: > > &wdog1 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_wdog>; > fsl,ext-reset-output; > }; > > So it would be better just use the same bindings in U-Boot without > the > need of deviating the device tree. wdt-reboot is a node to represent the wdt based sysreset driver. It references the existing wdog1 via a phandle. See drivers/sysreset/sysreset_watchdog.c
diff --git a/arch/arm/dts/imx6q-bx50v3.dts b/arch/arm/dts/imx6q-bx50v3.dts index 28a35394f0..2e2e3bbc24 100644 --- a/arch/arm/dts/imx6q-bx50v3.dts +++ b/arch/arm/dts/imx6q-bx50v3.dts @@ -18,6 +18,10 @@ ethernet0 = &fec; }; + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + }; }; &iomuxc { diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index cd0bf5bab5..cddc558484 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -63,6 +63,9 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_IPUV3=y CONFIG_WATCHDOG_TIMEOUT_MSECS=6000 CONFIG_IMX_WATCHDOG=y +CONFIG_WDT=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y # CONFIG_EFI_LOADER is not set CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SYS_WHITE_ON_BLACK=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/imx6q-bx50v3.dts | 4 ++++ configs/ge_bx50v3_defconfig | 3 +++ 2 files changed, 7 insertions(+)