summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/i2c.c
diff options
context:
space:
mode:
authorPaul Walmsley2012-10-30 03:57:44 +0100
committerPaul Walmsley2012-11-08 23:09:26 +0100
commitb13159afb46f8a528fcf30bac26c07dbb40a784a (patch)
treec838c9b8f3fb59c27b89569fe8d18863984b4349 /arch/arm/mach-omap2/i2c.c
parentARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup (diff)
downloadkernel-qcow2-linux-b13159afb46f8a528fcf30bac26c07dbb40a784a.tar.gz
kernel-qcow2-linux-b13159afb46f8a528fcf30bac26c07dbb40a784a.tar.xz
kernel-qcow2-linux-b13159afb46f8a528fcf30bac26c07dbb40a784a.zip
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/i2c.c')
-rw-r--r--arch/arm/mach-omap2/i2c.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c
index ad55b943108f..be092e8e5d85 100644
--- a/arch/arm/mach-omap2/i2c.c
+++ b/arch/arm/mach-omap2/i2c.c
@@ -20,10 +20,11 @@
*/
#include "soc.h"
-#include "common.h"
#include "omap_hwmod.h"
#include "omap_device.h"
+#include "prm.h"
+#include "common.h"
#include "mux.h"
#include "i2c.h"
@@ -32,9 +33,6 @@
#define OMAP2_I2C_CON_OFFSET 0x24
#define OMAP4_I2C_CON_OFFSET 0xA4
-/* Maximum microseconds to wait for OMAP module to softreset */
-#define MAX_MODULE_SOFTRESET_WAIT 10000
-
#define MAX_OMAP_I2C_HWMOD_NAME_LEN 16
static void __init omap2_i2c_mux_pins(int bus_id)