diff options
| author | Tom Rini <trini@ti.com> | 2013-05-02 19:54:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-02 19:54:32 -0400 |
| commit | 3fe012854040280d1efd76dbe6c439e3219850ce (patch) | |
| tree | 59f04271c75eaf36a308bf86af2790974c836a30 /arch/powerpc/cpu/mpc85xx/cpu.c | |
| parent | e3288e1d152a213e71f99c093a4ef63041fe6997 (diff) | |
| parent | 9e186857c7f99600808b8ecb2fc0fa2adeddebaa (diff) | |
| download | olio-uboot-2014.01-3fe012854040280d1efd76dbe6c439e3219850ce.tar.xz olio-uboot-2014.01-3fe012854040280d1efd76dbe6c439e3219850ce.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index df2ab6d73..6ce483e17 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -282,14 +282,6 @@ unsigned long get_tbclk (void) #if defined(CONFIG_WATCHDOG) void -watchdog_reset(void) -{ - int re_enable = disable_interrupts(); - reset_85xx_watchdog(); - if (re_enable) enable_interrupts(); -} - -void reset_85xx_watchdog(void) { /* @@ -297,6 +289,16 @@ reset_85xx_watchdog(void) */ mtspr(SPRN_TSR, TSR_WIS); } + +void +watchdog_reset(void) +{ + int re_enable = disable_interrupts(); + + reset_85xx_watchdog(); + if (re_enable) + enable_interrupts(); +} #endif /* CONFIG_WATCHDOG */ /* |