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/omap_hwmod.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/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 37eeb45612f8..54b68121734c 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
| @@ -151,6 +151,7 @@ | |||
| 151 | #include "cm3xxx.h" | 151 | #include "cm3xxx.h" |
| 152 | #include "cminst44xx.h" | 152 | #include "cminst44xx.h" |
| 153 | #include "cm33xx.h" | 153 | #include "cm33xx.h" |
| 154 | #include "prm.h" | ||
| 154 | #include "prm3xxx.h" | 155 | #include "prm3xxx.h" |
| 155 | #include "prm44xx.h" | 156 | #include "prm44xx.h" |
| 156 | #include "prm33xx.h" | 157 | #include "prm33xx.h" |
| @@ -158,9 +159,6 @@ | |||
| 158 | #include "mux.h" | 159 | #include "mux.h" |
| 159 | #include "pm.h" | 160 | #include "pm.h" |
| 160 | 161 | ||
| 161 | /* Maximum microseconds to wait for OMAP module to softreset */ | ||
| 162 | #define MAX_MODULE_SOFTRESET_WAIT 10000 | ||
| 163 | |||
| 164 | /* Name of the OMAP hwmod for the MPU */ | 162 | /* Name of the OMAP hwmod for the MPU */ |
| 165 | #define MPU_INITIATOR_NAME "mpu" | 163 | #define MPU_INITIATOR_NAME "mpu" |
| 166 | 164 | ||