path: root/arch/arm/mach-davinci/dm644x.c
diff options
authorCyril Chemparathy <cyril@ti.com>2010-05-01 18:38:28 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-05-06 15:02:09 -0700
commitc78a5bc2e77e8fc5be29cda5b28c9b9afd0f4b6d (patch)
treefc54260054d1b46d9f4e6f47c56952a82ee6b1e4 /arch/arm/mach-davinci/dm644x.c
parent5b3a05ca911688c53680f2b020a1512b9da29c89 (diff)
Davinci: watchdog reset separation across socs
The earlier watchdog reset mechanism had a couple of limitations. First, it embedded a reference to "davinci_wdt_device" inside common code. This forced all derived platforms (da8xx and tnetv107x) to define such a device. This also would have caused problems in including multiple socs in a single build due to symbol redefinition. With this patch, davinci_watchdog_reset() now takes the platform device as an argument. The davinci_soc_info struct has been extended to include a reset function and a watchdog platform_device. arch_reset() then uses these elements to reset the system in a SoC specific fashion. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Tested-by: Sandeep Paulraj <s-paulraj@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/dm644x.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 85c88ecd6cf..7f36c22a268 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -753,6 +753,7 @@ static struct davinci_soc_info davinci_soc_info_dm644x = {
.emac_pdata = &dm644x_emac_pdata,
.sram_dma = 0x00008000,
.sram_len = SZ_16K,
+ .reset_device = &davinci_wdt_device,
void __init dm644x_init_asp(struct snd_platform_data *pdata)