Move mips_cm_probe after prom_init so we can use fdt functions in mips_cm_probe to obtain essential information. Impat for all systems that may have CM in system: - geneirc: Adjusted code to accommodate this change - Lantiq: No impact, CM configuration won't be changed at all - ralink: Called mips_cm_probe on it's own, in prom_init->prom_soc_init - malta: No impact, CM address comes from CP0_CMGCR Signed-off-by: Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx> --- arch/mips/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 12a1a4ffb602..732579c8f4f8 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -773,8 +773,8 @@ static void __init setup_rng_seed(void) void __init setup_arch(char **cmdline_p) { cpu_probe(); - mips_cm_probe(); prom_init(); + mips_cm_probe(); setup_early_fdc_console(); #ifdef CONFIG_EARLY_PRINTK -- 2.34.1