Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Antony Pavlov and committed by
Ralf Baechle
f4fe969d 3bdf1071

+9 -7
+9 -7
arch/mips/ath79/setup.c
··· 207 207 else if (fw_arg0 == -2) 208 208 __dt_setup_arch((void *)KSEG0ADDR(fw_arg1)); 209 209 210 - ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE, 211 - AR71XX_RESET_SIZE); 212 - ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE, 213 - AR71XX_PLL_SIZE); 214 - ath79_detect_sys_type(); 215 - ath79_ddr_ctrl_init(); 216 - 217 210 if (mips_machtype != ATH79_MACH_GENERIC_OF) { 211 + ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE, 212 + AR71XX_RESET_SIZE); 213 + ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE, 214 + AR71XX_PLL_SIZE); 215 + ath79_detect_sys_type(); 216 + ath79_ddr_ctrl_init(); 217 + 218 218 detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX); 219 + 219 220 /* OF machines should use the reset driver */ 220 221 _machine_restart = ath79_restart; 221 222 } 223 + 222 224 _machine_halt = ath79_halt; 223 225 pm_power_off = ath79_halt; 224 226 }