0cd478518f
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa). Changelogs: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10 096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied upstream and dropped. Signed-off-by: Mathias Kresin <openwrt@kresin.me> [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47104
22 lines
603 B
Diff
22 lines
603 B
Diff
--- a/arch/mips/ath79/clock.c
|
|
+++ b/arch/mips/ath79/clock.c
|
|
@@ -25,7 +25,7 @@
|
|
#include "common.h"
|
|
|
|
#define AR71XX_BASE_FREQ 40000000
|
|
-#define AR724X_BASE_FREQ 5000000
|
|
+#define AR724X_BASE_FREQ 40000000
|
|
#define AR913X_BASE_FREQ 5000000
|
|
|
|
struct clk {
|
|
@@ -99,8 +99,8 @@ static void __init ar724x_clocks_init(vo
|
|
div = ((pll >> AR724X_PLL_DIV_SHIFT) & AR724X_PLL_DIV_MASK);
|
|
freq = div * ref_rate;
|
|
|
|
- div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK);
|
|
- freq *= div;
|
|
+ div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK) * 2;
|
|
+ freq /= div;
|
|
|
|
cpu_rate = freq;
|
|
|