summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/common.c
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2011-12-05 14:29:46 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 16:57:09 +0400
commitc6121ddd1f75278ab77504af2914d07831558672 (patch)
treec286a1854d96375e2c3e968301087461e12d2138 /arch/arm/mach-davinci/common.c
parent3921470527fa2800f575dee376712f2a6584db91 (diff)
downloadlinux-c6121ddd1f75278ab77504af2914d07831558672.tar.xz
ARM: 7190/1: restart: davinci: use new restart hook
Rather than using DaVinci specific davinci_soc_info based restart hook, use the restart hook available in the machine descriptor instead. Tested on DM365 and AM18x EVMs. v2: Changed to use restart hook in machine descriptor per Russell's comment. Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-davinci/common.c')
-rw-r--r--arch/arm/mach-davinci/common.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c
index 865ffe5899ac..cb9b2e47510c 100644
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -97,9 +97,6 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info)
local_flush_tlb_all();
flush_cache_all();
- if (!davinci_soc_info.reset)
- davinci_soc_info.reset = davinci_watchdog_reset;
-
/*
* We want to check CPU revision early for cpu_is_xxxx() macros.
* IO space mapping must be initialized before we can do that.