diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-08-28 10:41:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-26 17:18:27 -0700 |
| commit | 2008c41d079db04dfc6d6a29bd8a7292ed1299a3 (patch) | |
| tree | 3ba7ad295ab34619d21e00366537911430301e72 /arch/mips | |
| parent | d041e861d49f1f558e9e18f2075345f8a37427dc (diff) | |
| download | linux-3.10-2008c41d079db04dfc6d6a29bd8a7292ed1299a3.tar.gz linux-3.10-2008c41d079db04dfc6d6a29bd8a7292ed1299a3.tar.bz2 linux-3.10-2008c41d079db04dfc6d6a29bd8a7292ed1299a3.zip | |
MIPS: ath79: Fix ar933x watchdog clock
commit a1191927ace7e6f827132aa9e062779eb3f11fa5 upstream.
The watchdog device on the AR933x is connected to
the AHB clock, however the current code uses the
reference clock. Due to the wrong rate, the watchdog
driver can't calculate correct register values for
a given timeout value and the watchdog unexpectedly
restarts the system.
The code uses the wrong value since the initial
commit 04225e1d227c8e68d685936ecf42ac175fec0e54
(MIPS: ath79: add AR933X specific clock init)
The patch fixes the code to use the correct clock
rate to avoid the problem.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5777/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/ath79/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c index 765ef30e3e1..733017b3dfe 100644 --- a/arch/mips/ath79/clock.c +++ b/arch/mips/ath79/clock.c @@ -164,7 +164,7 @@ static void __init ar933x_clocks_init(void) ath79_ahb_clk.rate = freq / t; } - ath79_wdt_clk.rate = ath79_ref_clk.rate; + ath79_wdt_clk.rate = ath79_ahb_clk.rate; ath79_uart_clk.rate = ath79_ref_clk.rate; } |