203-MIPS-ath79-fix-restart.patch 638 B

1234567891011121314151617181920
  1. --- a/arch/mips/ath79/setup.c
  2. +++ b/arch/mips/ath79/setup.c
  3. @@ -44,6 +44,7 @@ static char ath79_sys_type[ATH79_SYS_TYP
  4. static void ath79_restart(char *command)
  5. {
  6. + local_irq_disable();
  7. ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
  8. for (;;)
  9. if (cpu_wait)
  10. --- a/arch/mips/include/asm/mach-ath79/ath79.h
  11. +++ b/arch/mips/include/asm/mach-ath79/ath79.h
  12. @@ -134,6 +134,7 @@ static inline u32 ath79_pll_rr(unsigned
  13. static inline void ath79_reset_wr(unsigned reg, u32 val)
  14. {
  15. __raw_writel(val, ath79_reset_base + reg);
  16. + (void) __raw_readl(ath79_reset_base + reg); /* flush */
  17. }
  18. static inline u32 ath79_reset_rr(unsigned reg)