diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-10-29 22:57:44 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-11-08 17:09:26 -0500 |
commit | b13159afb46f8a528fcf30bac26c07dbb40a784a (patch) | |
tree | c838c9b8f3fb59c27b89569fe8d18863984b4349 /arch/arm/mach-omap2/prcm-common.h | |
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/prcm-common.h')
-rw-r--r-- | arch/arm/mach-omap2/prcm-common.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h index b25a32a5e548..c7d355fafd24 100644 --- a/arch/arm/mach-omap2/prcm-common.h +++ b/arch/arm/mach-omap2/prcm-common.h | |||
@@ -406,11 +406,6 @@ | |||
406 | #define OMAP3430_EN_CORE_MASK (1 << 0) | 406 | #define OMAP3430_EN_CORE_MASK (1 << 0) |
407 | 407 | ||
408 | 408 | ||
409 | /* | ||
410 | * MAX_MODULE_HARDRESET_WAIT: Maximum microseconds to wait for an OMAP | ||
411 | * submodule to exit hardreset | ||
412 | */ | ||
413 | #define MAX_MODULE_HARDRESET_WAIT 10000 | ||
414 | 409 | ||
415 | /* | 410 | /* |
416 | * Maximum time(us) it takes to output the signal WUCLKOUT of the last | 411 | * Maximum time(us) it takes to output the signal WUCLKOUT of the last |
@@ -419,7 +414,6 @@ | |||
419 | * microseconds on OMAP4, so this timeout may be too high. | 414 | * microseconds on OMAP4, so this timeout may be too high. |
420 | */ | 415 | */ |
421 | #define MAX_IOPAD_LATCH_TIME 100 | 416 | #define MAX_IOPAD_LATCH_TIME 100 |
422 | |||
423 | # ifndef __ASSEMBLER__ | 417 | # ifndef __ASSEMBLER__ |
424 | 418 | ||
425 | /** | 419 | /** |