diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-10-29 20:57:44 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-08 15:09:26 -0700 |
| commit | b13159afb46f8a528fcf30bac26c07dbb40a784a (patch) | |
| tree | c838c9b8f3fb59c27b89569fe8d18863984b4349 /arch/arm/mach-omap2/wd_timer.c | |
| parent | d9a16f9ab9332b7cf1c95086a4efb98a0d13a57a (diff) | |
ARM: OMAP2+: PRCM: consolidate PRCM-related timeout macros
Consolidate all of the copies of MAX_MODULE_HARDRESET_WAIT and
MAX_MODULE_SOFTRESET_WAIT into one place, arch/arm/mach-omap2/prm.h.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/wd_timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/wd_timer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c index 5a8629ff0ab..7c2b4ed38f0 100644 --- a/arch/arm/mach-omap2/wd_timer.c +++ b/arch/arm/mach-omap2/wd_timer.c @@ -1,6 +1,8 @@ /* * OMAP2+ MPU WD_TIMER-specific code * + * Copyright (C) 2012 Texas Instruments, Inc. + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -30,9 +32,6 @@ #define OMAP_WDT_WPS 0x34 #define OMAP_WDT_SPR 0x48 -/* Maximum microseconds to wait for OMAP module to softreset */ -#define MAX_MODULE_SOFTRESET_WAIT 10000 - int omap2_wd_timer_disable(struct omap_hwmod *oh) { void __iomem *base; |