diff options
| author | Tom Rini <trini@ti.com> | 2013-09-06 20:25:35 -0400 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-09-06 20:25:35 -0400 | 
| commit | 47f75cf2e1d8648e3438630f3a4bddf9b5caa25d (patch) | |
| tree | 1d0f8f8943d44245381f255a059e258c696bc5a8 /arch/arm/cpu/armv7/socfpga/misc.c | |
| parent | 1affd4d4a3fe512050e1ad1636d9360c670da531 (diff) | |
| parent | 68e1747f9c0506159e8ecc9a4feb58e9c65a7b39 (diff) | |
| download | olio-uboot-2014.01-47f75cf2e1d8648e3438630f3a4bddf9b5caa25d.tar.xz olio-uboot-2014.01-47f75cf2e1d8648e3438630f3a4bddf9b5caa25d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga/misc.c')
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/misc.c | 27 | 
1 files changed, 0 insertions, 27 deletions
| diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c index 66edb3c20..2f1c7160f 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/arch/arm/cpu/armv7/socfpga/misc.c @@ -6,36 +6,9 @@  #include <common.h>  #include <asm/io.h> -#include <asm/arch/reset_manager.h>  DECLARE_GLOBAL_DATA_PTR; -static const struct socfpga_reset_manager *reset_manager_base = -		(void *)SOCFPGA_RSTMGR_ADDRESS; - -/* - * Write the reset manager register to cause reset - */ -void reset_cpu(ulong addr) -{ -	/* request a warm reset */ -	writel(RSTMGR_CTRL_SWWARMRSTREQ_LSB, &reset_manager_base->ctrl); -	/* -	 * infinite loop here as watchdog will trigger and reset -	 * the processor -	 */ -	while (1) -		; -} - -/* - * Release peripherals from reset based on handoff - */ -void reset_deassert_peripherals_handoff(void) -{ -	writel(0, &reset_manager_base->per_mod_reset); -} -  int dram_init(void)  {  	gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); |