Commit 8e8dc04c authored by Tom Rini's avatar Tom Rini
Browse files

Merge branch 'master' of git://git.denx.de/u-boot-sh

parents 5f9070a4 d03ad060
...@@ -47,23 +47,10 @@ int board_init(void) ...@@ -47,23 +47,10 @@ int board_init(void)
} }
#define RST_BASE 0xE6160000 #define RST_BASE 0xE6160000
#define RST_CA57RESCNT (RST_BASE + 0x40)
#define RST_CA53RESCNT (RST_BASE + 0x44) #define RST_CA53RESCNT (RST_BASE + 0x44)
#define RST_RSTOUTCR (RST_BASE + 0x58)
#define RST_CA57_CODE 0xA5A5000F
#define RST_CA53_CODE 0x5A5A000F #define RST_CA53_CODE 0x5A5A000F
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
{ {
unsigned long midr, cputype; writel(RST_CA53_CODE, RST_CA53RESCNT);
asm volatile("mrs %0, midr_el1" : "=r" (midr));
cputype = (midr >> 4) & 0xfff;
if (cputype == 0xd03)
writel(RST_CA53_CODE, RST_CA53RESCNT);
else if (cputype == 0xd07)
writel(RST_CA57_CODE, RST_CA57RESCNT);
else
hang();
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment