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>

diff --cc arch/arm/mach-omap2/display.c
Simple merge

diff --cc arch/arm/mach-omap2/hdq1w.c
Simple merge

diff --cc arch/arm/mach-omap2/i2c.c
Simple merge

diff --cc arch/arm/mach-omap2/msdi.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/prcm-common.h
Simple merge

diff --cc arch/arm/mach-omap2/prm.h
Simple merge

diff --cc arch/arm/mach-omap2/prm2xxx_3xxx.h
Simple merge

diff --cc arch/arm/mach-omap2/wd_timer.c
Simple merge