21 lines
638 B
Diff
21 lines
638 B
Diff
|
--- a/arch/mips/ath79/setup.c
|
||
|
|
+++ b/arch/mips/ath79/setup.c
|
||
|
|
@@ -44,6 +44,7 @@ static char ath79_sys_type[ATH79_SYS_TYP
|
||
|
|
|
||
|
|
static void ath79_restart(char *command)
|
||
|
|
{
|
||
|
|
+ local_irq_disable();
|
||
|
|
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
|
||
|
|
@@ -134,6 +134,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)
|