diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-28 11:04:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-28 11:04:50 -0500 |
| commit | 783b6a71734e8bd3af9f191ee5be7b9e8ce9f96a (patch) | |
| tree | e865521183ceb2d8968e0dc2bae312d5381eee29 | |
| parent | 12fdbbe860f395575f360f0c03d84bce61a9a212 (diff) | |
| parent | 7e00e907f51fd9335127c323d6a0eacdbb7e7013 (diff) | |
Merge branch '2020-02-28-mpc8xx-fixes'
- Fix the watchdog on mpc8xx platforms
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/watchdog/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/watchdog/mpc8xx_wdt.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig index 3e8ea38529..f112317376 100644 --- a/arch/powerpc/cpu/mpc8xx/Kconfig +++ b/arch/powerpc/cpu/mpc8xx/Kconfig @@ -25,10 +25,6 @@ config MPC885 endchoice -#config MPC8xx_WATCHDOG -# bool "Watchdog" -# select HW_WATCHDOG - config 8xx_GCLK_FREQ int "CPU GCLK Frequency" diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 36fbdce552..d24c1e4835 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -2,6 +2,7 @@ menu "Watchdog Timer Support" config WATCHDOG bool "Enable U-Boot watchdog reset" + depends on !HW_WATCHDOG help This option enables U-Boot watchdog support where U-Boot is using watchdog_reset function to service watchdog device in U-Boot. Enable @@ -118,7 +119,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 diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c index 675b62d8b3..30758aeed4 100644 --- a/drivers/watchdog/mpc8xx_wdt.c +++ b/drivers/watchdog/mpc8xx_wdt.c @@ -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; |