From 9305f5c09159d8488014a8619f0af4ffdfb71003 Mon Sep 17 00:00:00 2001
From: Oleksij Rempel <o.rempel@pengutronix.de>
Date: Mon, 21 Oct 2019 13:50:20 +0200
Subject: MIPS: move r4k_cache_init in to cpu_probe function

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/mips/boot/main_entry.c   | 6 ------
 arch/mips/include/asm/cache.h | 1 +
 arch/mips/lib/cpu-probe.c     | 5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/mips/boot/main_entry.c b/arch/mips/boot/main_entry.c
index 4ae4457e7e..2c18bc81c3 100644
--- a/arch/mips/boot/main_entry.c
+++ b/arch/mips/boot/main_entry.c
@@ -77,12 +77,6 @@ void __bare_init main_entry(void *fdt, u32 fdt_size)
 
 	cpu_probe();
 
-	if (cpu_has_4k_cache) {
-		extern void r4k_cache_init(void);
-
-		r4k_cache_init();
-	}
-
 	trap_init();
 
 	malloc_end = (unsigned long)_stext;
diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
index cceba0acc0..4bb39b1cd4 100644
--- a/arch/mips/include/asm/cache.h
+++ b/arch/mips/include/asm/cache.h
@@ -2,5 +2,6 @@
 #define _ASM_MIPS_CACHE_H
 
 void flush_cache_all(void);
+void r4k_cache_init(void);
 
 #endif /* _ASM_MIPS_CACHE_H */
diff --git a/arch/mips/lib/cpu-probe.c b/arch/mips/lib/cpu-probe.c
index 2556a8b240..ddabddd466 100644
--- a/arch/mips/lib/cpu-probe.c
+++ b/arch/mips/lib/cpu-probe.c
@@ -9,6 +9,8 @@
  */
 #include <common.h>
 #include <asm/mipsregs.h>
+#include <asm/cache.h>
+#include <asm/cpu-features.h>
 #include <asm/cpu-info.h>
 #include <asm/cpu.h>
 #include <memory.h>
@@ -163,6 +165,9 @@ void cpu_probe(void)
 		cpu_probe_ingenic(c);
 		break;
 	}
+
+	if (cpu_has_4k_cache)
+		r4k_cache_init();
 }
 
 unsigned long mips_stack_top;
-- 
cgit v1.2.3