diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-10-30 02:57:44 (GMT) |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-08 22:09:26 (GMT) |
| commit | b13159afb46f8a528fcf30bac26c07dbb40a784a (patch) | |
| tree | c838c9b8f3fb59c27b89569fe8d18863984b4349 /arch/arm/mach-omap2/display.c | |
| parent | d9a16f9ab9332b7cf1c95086a4efb98a0d13a57a (diff) | |
| download | linux-b13159afb46f8a528fcf30bac26c07dbb40a784a.tar.xz | |
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/display.c')
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 89c5712..38ba58c 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -35,6 +35,7 @@ #include "mux.h" #include "control.h" #include "display.h" +#include "prm.h" #define DISPC_CONTROL 0x0040 #define DISPC_CONTROL2 0x0238 @@ -512,7 +513,6 @@ static void dispc_disable_outputs(void) } } -#define MAX_MODULE_SOFTRESET_WAIT 10000 int omap_dss_reset(struct omap_hwmod *oh) { struct omap_hwmod_opt_clk *oc; |