kernel: bump 4.14 to 4.14.41
[openwrt/staging/stintel.git] / target / linux / ath79 / patches-4.14 / 0013-MIPS-ath79-fix-system-restart.patch
index ecf275db8213a53d79424c96080bc4e5868c3e0d..969636128f5c3e9bdf533edabfc5125e9b494e55 100644 (file)
@@ -10,11 +10,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
  arch/mips/include/asm/mach-ath79/ath79.h | 1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
-index f206dafbb0a3..26a058d58d37 100644
 --- a/arch/mips/ath79/setup.c
 +++ b/arch/mips/ath79/setup.c
-@@ -40,6 +40,7 @@ static char ath79_sys_type[ATH79_SYS_TYPE_LEN];
+@@ -40,6 +40,7 @@ static char ath79_sys_type[ATH79_SYS_TYP
  
  static void ath79_restart(char *command)
  {
@@ -22,11 +20,9 @@ index f206dafbb0a3..26a058d58d37 100644
        ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
        for (;;)
                if (cpu_wait)
-diff --git a/arch/mips/include/asm/mach-ath79/ath79.h b/arch/mips/include/asm/mach-ath79/ath79.h
-index 441faa92c3cd..6e6c0fead776 100644
 --- 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 reg)
+@@ -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);
@@ -34,6 +30,3 @@ index 441faa92c3cd..6e6c0fead776 100644
  }
  
  static inline u32 ath79_reset_rr(unsigned reg)
--- 
-2.11.0
-