Commit f7a1a1db authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_update_for_v5.5' of... 

Merge tag 'socfpga_update_for_v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes

SoCFPGA updates for v5.5
- Issue COLD reboot by default for SoCFPGA platforms

* tag 'socfpga_update_for_v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm: socfpga: execute cold reboot by default

Link: https://lore.kernel.org/r/20191122182106.822-1-dinguyen@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e89d108d 71686458

arch/arm/mach-socfpga/socfpga.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -73,10 +73,10 @@ static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd) 




	temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);

	temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);





	if (mode == REBOOT_HARD)

	if (mode == REBOOT_WARM)

		temp |= RSTMGR_CTRL_SWCOLDRSTREQ;

	else

		temp |= RSTMGR_CTRL_SWWARMRSTREQ;

		temp |= RSTMGR_CTRL_SWWARMRSTREQ;

	else

		temp |= RSTMGR_CTRL_SWCOLDRSTREQ;

	writel(temp, rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);

	writel(temp, rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);

}

}
@@ -86,10 +86,10 @@ static void socfpga_arria10_restart(enum reboot_mode mode, const char *cmd) 




	temp = readl(rst_manager_base_addr + SOCFPGA_A10_RSTMGR_CTRL);

	temp = readl(rst_manager_base_addr + SOCFPGA_A10_RSTMGR_CTRL);





	if (mode == REBOOT_HARD)

	if (mode == REBOOT_WARM)

		temp |= RSTMGR_CTRL_SWCOLDRSTREQ;

	else

		temp |= RSTMGR_CTRL_SWWARMRSTREQ;

		temp |= RSTMGR_CTRL_SWWARMRSTREQ;

	else

		temp |= RSTMGR_CTRL_SWCOLDRSTREQ;

	writel(temp, rst_manager_base_addr + SOCFPGA_A10_RSTMGR_CTRL);

	writel(temp, rst_manager_base_addr + SOCFPGA_A10_RSTMGR_CTRL);

}

}