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/msdi.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/msdi.c')
-rw-r--r-- | arch/arm/mach-omap2/msdi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/msdi.c b/arch/arm/mach-omap2/msdi.c index 627e97e30743..aafdd4ca9f4f 100644 --- a/arch/arm/mach-omap2/msdi.c +++ b/arch/arm/mach-omap2/msdi.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
26 | #include <linux/platform_data/gpio-omap.h> | 26 | #include <linux/platform_data/gpio-omap.h> |
27 | 27 | ||
28 | #include "prm.h" | ||
28 | #include "common.h" | 29 | #include "common.h" |
29 | #include "control.h" | 30 | #include "control.h" |
30 | #include "omap_hwmod.h" | 31 | #include "omap_hwmod.h" |
@@ -43,9 +44,6 @@ | |||
43 | #define MSDI_CON_CLKD_MASK (0x3f << 0) | 44 | #define MSDI_CON_CLKD_MASK (0x3f << 0) |
44 | #define MSDI_CON_CLKD_SHIFT 0 | 45 | #define MSDI_CON_CLKD_SHIFT 0 |
45 | 46 | ||
46 | /* Maximum microseconds to wait for OMAP module to softreset */ | ||
47 | #define MAX_MODULE_SOFTRESET_WAIT 10000 | ||
48 | |||
49 | /* MSDI_TARGET_RESET_CLKD: clock divisor to use throughout the reset */ | 47 | /* MSDI_TARGET_RESET_CLKD: clock divisor to use throughout the reset */ |
50 | #define MSDI_TARGET_RESET_CLKD 0x3ff | 48 | #define MSDI_TARGET_RESET_CLKD 0x3ff |
51 | 49 | ||