Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

watchdog: mpc8xx: Revert the 8xx watchdog back to CONFIG_HW_WATCHDOG

Browse source 
Commit f3729ba6e7 ("watchdog: mpc8xx_wdt: Watchdog driver and macros
cleanup") switched the watchdog to CONFIG_WATCHDOG. But this is not
compatible with the 8xx because it starts the watchdog HW timer at
reset and must be serviced from the very beginning including while
U-boot is executed in the firmware before relocation in RAM.

Select CONFIG_HW_WATCHDOG and make hw_watchdog_reset() visible.

Meanwhile, finalise the cleanup of arch/powerpc/cpu/mpc8xx/Kconfig by
removing the lines put in comment in that commit, and also remove
again the selection of CONFIG_MPC8xx_WATCHDOG which was removed by
that commit and brought back by mistake by commit b3134ffbd9
("watchdog: Kconfig: Sort entry alphabetically")

Note that there was an 'imply WATCHDOG' in the original commit but
it disappeared in the Kconfig alphabetical sorting, so no need to
remove it here.

Fixes: f3729ba6e7 ("watchdog: mpc8xx_wdt: Watchdog driver and macros cleanup")
Fixes: b3134ffbd9 ("watchdog: Kconfig: Sort entry alphabetically")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Stefan Roese <sr@denx.de>
Cc: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Christophe Leroy 2020-02-20 07:39:51 +00:00 committed by Tom Rini
parent 12fdbbe860
commit a68256074f
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/cpu/mpc8xx/Kconfig
View file

@ -25,10 +25,6 @@ config MPC885
endchoice
#config MPC8xx_WATCHDOG
# bool "Watchdog"
# select HW_WATCHDOG
config 8xx_GCLK_FREQ
int "CPU GCLK Frequency"

2
drivers/watchdog/Kconfig
View file

@ -118,7 +118,7 @@ config WDT_CORTINA
config WDT_MPC8xx
bool "MPC8xx watchdog timer support"
depends on WDT && MPC8xx
select CONFIG_MPC8xx_WATCHDOG
select HW_WATCHDOG
help
Select this to enable mpc8xx watchdog timer

2
drivers/watchdog/mpc8xx_wdt.c
View file

@ -10,7 +10,7 @@
#include <asm/cpm_8xx.h>
#include <asm/io.h>
static void hw_watchdog_reset(void)
void hw_watchdog_reset(void)
{
immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;