MIPS: ath79: Disable platform code for OF boards.

For OF boards we have to skip platform initialization code
so we can prove that OF code do all necessary initialization.

[ralf@linux-mips.org: Fix merge conflict.]
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Reviewed-by: Marek Vasut <marex@denx.de>
Cc: Alban Bedel <albeu@free.fr>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/12877/
Patchwork: https://patchwork.linux-mips.org/patch/12920/Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/ath79/setup.c

@@ -207,6 +207,7 @@ void __init plat_mem_setup(void)
 	else if (fw_arg0 == -2)
 		__dt_setup_arch((void *)KSEG0ADDR(fw_arg1));
 
+	if (mips_machtype != ATH79_MACH_GENERIC_OF) {
 		ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
 						   AR71XX_RESET_SIZE);
 		ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,
@@ -214,11 +215,12 @@ void __init plat_mem_setup(void)
 		ath79_detect_sys_type();
 		ath79_ddr_ctrl_init();
 
-	if (mips_machtype != ATH79_MACH_GENERIC_OF) {
 		detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
+
 		/* OF machines should use the reset driver */
 		_machine_restart = ath79_restart;
 	}
+
 	_machine_halt = ath79_halt;
 	pm_power_off = ath79_halt;
 }