summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/headsmp.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra/headsmp.S')
-rw-r--r--arch/arm/mach-tegra/headsmp.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S
index 0f1e52d89edc..6693aacbbbe7 100644
--- a/arch/arm/mach-tegra/headsmp.S
+++ b/arch/arm/mach-tegra/headsmp.S
@@ -124,10 +124,13 @@ ENTRY(__tegra_cpu_reset_handler)
mcrlt p15, 0, r10, c15, c0, 1 @ write diagnostic register
#endif
#ifdef CONFIG_ARM_ERRATA_752520
+ teq r5, #0x00100000 @ not present in r1p*
+ beq skip_752520
cmp r6, #0x29 @ present prior to r2p9
mrclt p15, 0, r10, c15, c0, 1 @ read diagnostic register
orrlt r10, r10, #1 << 20 @ set bit #20
mcrlt p15, 0, r10, c15, c0, 1 @ write diagnostic register
+skip_752520:
#endif
#endif
mrc p15, 0, r10, c0, c0, 5 @ MPIDR