| Message ID | 20200227110605.22144-1-m.felsch@pengutronix.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 1f4e29d24b9da9854456cd3c517a8cf6bd2bfd67 |
| Headers | show |
| Series | [1/2] ARM: dts: imx6: phycore-som: explicit disable pmic watchdog during suspend | expand |
On Thu, Feb 27, 2020 at 12:06:04PM +0100, Marco Felsch wrote: > By default the phycore-som has support for two watchdog devices: 1st the > internal imx6 watchdog and 2nd the DA9062 PMIC watchdog. According [1] > the PMIC watchdog is used as boot watchdog. It is common to use this > watchdog during "system up" time too. Furthermore the PMIC watchdog can > be used to address ERR007117 since the phycore-som can be equipped with > NAND or eMMC storage. > > The PMIC watchdog can be enabled/disabled by the PMIC itself if the PMIC > enters POWERDOWN mode or by the host. The PMIC powerdown mode can't be > used due to the PCB design. So the watchdog is still enabled during a > suspend which causes a system reset. We need to tell the driver to > disable the watchdog during a system suspend and to reenable it upon a > resume to fix this. > > [1] https://git.pengutronix.de/cgit/barebox/tree/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi#n73 > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> Applied, thanks.
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi index 77d871340eb7..8b71bf33ba30 100644 --- a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi @@ -107,6 +107,7 @@ watchdog { compatible = "dlg,da9062-watchdog"; + dlg,use-sw-pm; }; regulators {
By default the phycore-som has support for two watchdog devices: 1st the internal imx6 watchdog and 2nd the DA9062 PMIC watchdog. According [1] the PMIC watchdog is used as boot watchdog. It is common to use this watchdog during "system up" time too. Furthermore the PMIC watchdog can be used to address ERR007117 since the phycore-som can be equipped with NAND or eMMC storage. The PMIC watchdog can be enabled/disabled by the PMIC itself if the PMIC enters POWERDOWN mode or by the host. The PMIC powerdown mode can't be used due to the PCB design. So the watchdog is still enabled during a suspend which causes a system reset. We need to tell the driver to disable the watchdog during a system suspend and to reenable it upon a resume to fix this. [1] https://git.pengutronix.de/cgit/barebox/tree/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi#n73 Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> --- Hi, I tested it on a with a phycore imx6q other testers are welcome =) The binding landed in v5.6-rc1 and the driver handling in v5.6-rc3. Regards, Marco arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 1 + 1 file changed, 1 insertion(+)