aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/wd_timer.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-10-29 22:57:44 -0400
committerPaul Walmsley <paul@pwsan.com>2012-11-08 17:09:26 -0500
commitb13159afb46f8a528fcf30bac26c07dbb40a784a (patch)
treec838c9b8f3fb59c27b89569fe8d18863984b4349 /arch/arm/mach-omap2/wd_timer.c
parentd9a16f9ab9332b7cf1c95086a4efb98a0d13a57a (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/wd_timer.c')
-rw-r--r--arch/arm/mach-omap2/wd_timer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
index 5a8629ff0ab0..7c2b4ed38f02 100644
--- a/arch/arm/mach-omap2/wd_timer.c
+++ b/arch/arm/mach-omap2/wd_timer.c
@@ -1,6 +1,8 @@
1/* 1/*
2 * OMAP2+ MPU WD_TIMER-specific code 2 * OMAP2+ MPU WD_TIMER-specific code
3 * 3 *
4 * Copyright (C) 2012 Texas Instruments, Inc.
5 *
4 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; either version 2 of the License, or 8 * the Free Software Foundation; either version 2 of the License, or
@@ -30,9 +32,6 @@
30#define OMAP_WDT_WPS 0x34 32#define OMAP_WDT_WPS 0x34
31#define OMAP_WDT_SPR 0x48 33#define OMAP_WDT_SPR 0x48
32 34
33/* Maximum microseconds to wait for OMAP module to softreset */
34#define MAX_MODULE_SOFTRESET_WAIT 10000
35
36int omap2_wd_timer_disable(struct omap_hwmod *oh) 35int omap2_wd_timer_disable(struct omap_hwmod *oh)
37{ 36{
38 void __iomem *base; 37 void __iomem *base;