summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/msdi.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-10-30 06:57:44 +0400
committerPaul Walmsley <paul@pwsan.com>2012-11-09 02:09:26 +0400
commitb13159afb46f8a528fcf30bac26c07dbb40a784a (patch)
treec838c9b8f3fb59c27b89569fe8d18863984b4349 /arch/arm/mach-omap2/msdi.c
parentd9a16f9ab9332b7cf1c95086a4efb98a0d13a57a (diff)
downloadlinux-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/msdi.c')
-rw-r--r--arch/arm/mach-omap2/msdi.c4
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 @@
#include <linux/err.h>
#include <linux/platform_data/gpio-omap.h>
+#include "prm.h"
#include "common.h"
#include "control.h"
#include "omap_hwmod.h"
@@ -43,9 +44,6 @@
#define MSDI_CON_CLKD_MASK (0x3f << 0)
#define MSDI_CON_CLKD_SHIFT 0
-/* Maximum microseconds to wait for OMAP module to softreset */
-#define MAX_MODULE_SOFTRESET_WAIT 10000
-
/* MSDI_TARGET_RESET_CLKD: clock divisor to use throughout the reset */
#define MSDI_TARGET_RESET_CLKD 0x3ff