summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/lowlevel_init.S
diff options
context:
space:
mode:
authorTom Warren <twarren@nvidia.com>2015-03-04 16:36:00 -0700
committerTom Warren <twarren@nvidia.com>2015-07-28 10:30:20 -0700
commit7aaa5a60cec8c0f139c8be5fea7d639e06a0f88e (patch)
tree677f1285e60b87ed648e5186f5235999c87aba30 /arch/arm/mach-tegra/lowlevel_init.S
parent6c43f6c8d920caa1db01f5d0571a4d9ba720be15 (diff)
downloadtalos-obmc-uboot-7aaa5a60cec8c0f139c8be5fea7d639e06a0f88e.tar.gz
talos-obmc-uboot-7aaa5a60cec8c0f139c8be5fea7d639e06a0f88e.zip
ARM: Tegra210: Add support to common Tegra source/config files
Derived from Tegra124, modified as appropriate during T210 board bringup. Cleaned up debug statements to conserve string space, too. This also adds misc 64-bit changes from Thierry Reding/Stephen Warren. Signed-off-by: Tom Warren <twarren@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/lowlevel_init.S')
-rw-r--r--arch/arm/mach-tegra/lowlevel_init.S15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/lowlevel_init.S b/arch/arm/mach-tegra/lowlevel_init.S
index 4bc0a3f5a1..1273f94aa3 100644
--- a/arch/arm/mach-tegra/lowlevel_init.S
+++ b/arch/arm/mach-tegra/lowlevel_init.S
@@ -10,6 +10,20 @@
#include <config.h>
#include <linux/linkage.h>
+#ifdef CONFIG_ARM64
+ .align 5
+ENTRY(reset_cpu)
+ /* get address for global reset register */
+ ldr x1, =PRM_RSTCTRL
+ ldr w3, [x1]
+ /* force reset */
+ orr w3, w3, #0x10
+ str w3, [x1]
+ mov w0, w0
+1:
+ b 1b
+ENDPROC(reset_cpu)
+#else
.align 5
ENTRY(reset_cpu)
ldr r1, rstctl @ get addr for global reset
@@ -23,3 +37,4 @@ _loop_forever:
rstctl:
.word PRM_RSTCTRL
ENDPROC(reset_cpu)
+#endif
OpenPOWER on IntegriCloud