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

watchdog: mpc8xxx: Add support for mpc83xx

Browse source 
Introduce a new compatible "fsl,pq2pro-wdt"
On mpc83xx, the prescaling factor is 0x10000.

Don't write the watchdog configuration register in
start.S as it can be written only once.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
This commit is contained in:
Christophe Leroy 2023-04-03 10:39:59 +02:00
parent 26e8ebcd7c
commit 0fd79138dc
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/cpu/mpc83xx/cpu.c
View file

@ -165,7 +165,7 @@ unsigned long get_tbclk(void)
} }
#endif #endif
#if defined(CONFIG_WATCHDOG) #if defined(CONFIG_WATCHDOG) && !defined(CONFIG_WDT)
void watchdog_reset (void) void watchdog_reset (void)
{ {
int re_enable = disable_interrupts(); int re_enable = disable_interrupts();

2
arch/powerpc/cpu/mpc83xx/start.S
View file

@ -483,6 +483,7 @@ init_e300_core: /* time t 10 */
lis r3, CONFIG_SYS_IMMR@h lis r3, CONFIG_SYS_IMMR@h
#ifndef CONFIG_WDT_MPC8xxx
#if defined(CONFIG_WATCHDOG) #if defined(CONFIG_WATCHDOG)
/* Initialise the Watchdog values and reset it (if req) */ /* Initialise the Watchdog values and reset it (if req) */
/*------------------------------------------------------*/ /*------------------------------------------------------*/
@ -508,6 +509,7 @@ init_e300_core: /* time t 10 */
stw r4, SWCRR(r3) stw r4, SWCRR(r3)
1: 1:
#endif /* CONFIG_WATCHDOG */ #endif /* CONFIG_WATCHDOG */
#endif
#if defined(CONFIG_MASK_AER_AO) #if defined(CONFIG_MASK_AER_AO)
/* Write the Arbiter Event Enable to mask Address Only traps. */ /* Write the Arbiter Event Enable to mask Address Only traps. */

2
drivers/watchdog/Kconfig
View file

@ -186,7 +186,7 @@ config WDT_MESON_GXBB
config WDT_MPC8xxx config WDT_MPC8xxx
bool "MPC8xxx watchdog timer support" bool "MPC8xxx watchdog timer support"
depends on WDT && MPC8xx depends on WDT && (MPC8xx || MPC83xx)
help help
Select this to enable mpc8xxx watchdog timer Select this to enable mpc8xxx watchdog timer

1
drivers/watchdog/mpc8xxx_wdt.c
View file

@ -98,6 +98,7 @@ static const struct wdt_ops mpc8xxx_wdt_ops = {
static const struct udevice_id mpc8xxx_wdt_ids[] = { static const struct udevice_id mpc8xxx_wdt_ids[] = {
{ .compatible = "fsl,pq1-wdt", .data = 0x800 }, { .compatible = "fsl,pq1-wdt", .data = 0x800 },
{ .compatible = "fsl,pq2pro-wdt", .data = 0x10000 },
{} {}
}; };