diff options
| author | Christina Warren <cawarren@ti.com> | 2011-10-04 11:42:09 -0500 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-10-06 07:30:33 -0500 |
| commit | 706277ea7752672ad4abbc8dcdc87c7de5f87fa0 (patch) | |
| tree | 1721e34f532f6117e6845b555daac2d3d725f9c9 /drivers/i2c | |
| parent | 07544d7367476467b5e897055f276191d4283f6f (diff) | |
| download | kernel_samsung_espresso10-706277ea7752672ad4abbc8dcdc87c7de5f87fa0.tar.gz kernel_samsung_espresso10-706277ea7752672ad4abbc8dcdc87c7de5f87fa0.tar.bz2 kernel_samsung_espresso10-706277ea7752672ad4abbc8dcdc87c7de5f87fa0.zip | |
OMAP4: Avoid clearing i2c2 irq on A9 when HWSPINLOCK is enabled
This patch is related to this commit:
7dd92cb9a8b9c6bb0f4b03afd26ea50ec90cfb73
On Blaze and Blaze Tablet, the i2c-2 bus is shared by A9 and Ducati.
We want A9 to be able to access the i2c-2 bus when it needs it.
This patch will prevent the i2c-2 irq from being cleared on A9 when
Ducati requests the i2c-2 resource, since hwspinlock is being used to
arbitrate the use of the i2c-2 bus.
Change-Id: Iddb667f77e17d9799a9caa62d9f2a0a0043f1768
Signed-off-by: Christina Warren <cawarren@ti.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index d0ec08f65a2..87a5c7f364d 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1131,6 +1131,7 @@ EXPORT_SYMBOL(i2c_del_adapter); * This detects registered I2C devices which are controlled * by a remote/external proc. */ +#if !defined(CONFIG_HWSPINLOCK) void i2c_detect_ext_master(struct i2c_adapter *adap) { struct i2c_adapter *found; @@ -1160,6 +1161,9 @@ void i2c_detect_ext_master(struct i2c_adapter *adap) return; } +#else +void i2c_detect_ext_master(struct i2c_adapter *adap) { return; } +#endif EXPORT_SYMBOL(i2c_detect_ext_master); /* ------------------------------------------------------------------------- */ |