mx6: Disable Power Down Bit of watchdog
Subsystems (2)
PATCH v3 1/1 mx6: Disable Power Down Bit of watchdog
On a mx6qsabresd revision C board with rev1.2 mx6q, the system gets resetted and it is not able to reach the Linux prompt.
Comparing the watchdog behaviour on a revB versus revC board:
- On a mx6qsabresd revB:
U-Boot > reset
resetting ...
U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46)
CPU: Freescale i.MX6Q rev1.1 at 792 MHz
Reset cause: WDOG
...
- On a mx6qsabresd revC:
U-Boot > reset
resetting ...
U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46)
CPU: Freescale i.MX6Q rev1.1 at 792 MHz
Reset cause: POR
So due to revC POR/watchdog circuitry whenever a watchdog occurs, it causes a POR.
Clearing the PDE - Power Down Enable bit of WMCR registers fixes the problem and is also safe for all mx6 boards.
---
Changes since v2:
- Using bool can make the code cleaner
Changes since v1:
- Improve commit log
arch/arm/cpu/armv7/mx6/soc.c | 12 ++++++++++++ arch/arm/include/asm/arch-mx6/imx-regs.h | 8 ++++++++ 2 files changed, 20 insertions(+)
arch/arm/cpu/armv7/mx6/soc.c +12 -0
@@ -30,6 +30,7 @@#include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <asm/imx-common/boot_mode.h> +#include <stdbool.h> struct scu_regs {u32 ctrl;
@@ -121,12 +122,23 @@ void set_vddsoc(u32 mv)writel (reg, &anatop->reg_core); } +static void imx_set_wdog_powerdown (bool enable) +{ +struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR ; +struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR ; + +/* Write to the PDE (Power Down Enable) bit */ +writew (enable, &wdog1->wmcr); +writew (enable, &wdog2->wmcr); +} +int arch_cpu_init (void ) {init_aips ();set_vddsoc (1200 );/* Set VDDSOC to 1.2V */ +imx_set_wdog_powerdown (false);/* Disable PDE bit of WMCR register */ return 0 ; }
arch/arm/include/asm/arch-mx6/imx-regs.h +8 -0
@@ -601,5 +601,13 @@ struct iomuxc_base_regs {u32 daisy[104 ];/* 0x7b0..94c */ }; +struct wdog_regs { +u16 wcr;/* Control */ +u16 wsr;/* Service */ +u16 wrsr;/* Reset Status */ +u16 wicr;/* Interrupt Control */ +u16 wmcr;/* Miscellaneous Control */ +}; +#endif /* __ASSEMBLER__*/ #endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */
Signature · 1 line
1.7.9.5
PATCH v3 1/1 mx6: Disable Power Down Bit of watchdog
Quoted 26 lines · Fabio Estevam
On a mx6qsabresd revision C board with rev1.2 mx6q, the system gets resetted and it is not able to reach the Linux prompt.
Comparing the watchdog behaviour on a revB versus revC board:
- On a mx6qsabresd revB:
U-Boot > reset
resetting ...U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46)
CPU: Freescale i.MX6Q rev1.1 at 792 MHz
Reset cause: WDOG
...- On a mx6qsabresd revC:
U-Boot > reset
resetting ...U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46)
CPU: Freescale i.MX6Q rev1.1 at 792 MHz
Reset cause: POR
Quoted 6 lines
So due to revC POR/watchdog circuitry whenever a watchdog occurs, it causes a POR.
Clearing the PDE - Power Down Enable bit of WMCR registers fixes the problem and is also safe for all mx6 boards.
Signed-off-by Fabio Estevam <[email protected]>
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v3 1/1 mx6: Disable Power Down Bit of watchdog
In reply to Fabio EstevamQuoted 26 lines · Fabio Estevam
On a mx6qsabresd revision C board with rev1.2 mx6q, the system gets resetted and it is not able to reach the Linux prompt.
Comparing the watchdog behaviour on a revB versus revC board:
- On a mx6qsabresd revB:
U-Boot > reset
resetting ...U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46)
CPU: Freescale i.MX6Q rev1.1 at 792 MHz
Reset cause: WDOG
...- On a mx6qsabresd revC:
U-Boot > reset
resetting ...U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46)
CPU: Freescale i.MX6Q rev1.1 at 792 MHz
Reset cause: POR
Quoted 7 lines
So due to revC POR/watchdog circuitry whenever a watchdog occurs, it causes a POR.
Clearing the PDE - Power Down Enable bit of WMCR registers fixes the problem and is also safe for all mx6 boards.
Signed-off-by Fabio Estevam <[email protected]>---
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v3 1/1 mx6: Disable Power Down Bit of watchdog
In reply to Fabio EstevamQuoted 26 lines · Fabio Estevam
On a mx6qsabresd revision C board with rev1.2 mx6q, the system gets resetted and it is not able to reach the Linux prompt.
Comparing the watchdog behaviour on a revB versus revC board:
- On a mx6qsabresd revB:
U-Boot > reset
resetting ...U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46)
CPU: Freescale i.MX6Q rev1.1 at 792 MHz
Reset cause: WDOG
...- On a mx6qsabresd revC:
U-Boot > reset
resetting ...U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46)
CPU: Freescale i.MX6Q rev1.1 at 792 MHz
Reset cause: POR
Quoted 7 lines
So due to revC POR/watchdog circuitry whenever a watchdog occurs, it causes a POR.
Clearing the PDE - Power Down Enable bit of WMCR registers fixes the problem and is also safe for all mx6 boards.
Signed-off-by Fabio Estevam <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================