diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-01-20 16:41:46 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-20 16:41:46 +0000 |
| commit | 7aa11232b4d0e4a3230412121475e16efb5c7f62 (patch) | |
| tree | 34a87d8b38d6fd7055a835438a0acd8adcfcd05e | |
| parent | a010afafec157d9d7bdfc6d553ec864d0d40d557 (diff) | |
| download | upstream-7aa11232b4d0e4a3230412121475e16efb5c7f62.tar.gz upstream-7aa11232b4d0e4a3230412121475e16efb5c7f62.tar.bz2 upstream-7aa11232b4d0e4a3230412121475e16efb5c7f62.zip | |
ar71xx: backport restart fix from r43777 (fixes #17839)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@44065 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch b/target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch index 0027c59631..b8fc078ba0 100644 --- a/target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch +++ b/target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch @@ -8,3 +8,13 @@ ath79_device_reset_set(AR71XX_RESET_FULL_CHIP); for (;;) if (cpu_wait) +--- a/arch/mips/include/asm/mach-ath79/ath79.h ++++ b/arch/mips/include/asm/mach-ath79/ath79.h +@@ -144,6 +144,7 @@ static inline u32 ath79_pll_rr(unsigned + static inline void ath79_reset_wr(unsigned reg, u32 val) + { + __raw_writel(val, ath79_reset_base + reg); ++ (void) __raw_readl(ath79_reset_base + reg); /* flush */ + } + + static inline u32 ath79_reset_rr(unsigned reg) |