diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-11-09 07:45:45 -0600 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-11-09 07:45:45 -0600 |
| commit | 11a1ff5d4110e1357f0c77f42091a793010b9ef3 (patch) | |
| tree | 5d43af29eaf4d85a7281632bb6f198b4650ea23b /drivers/i2c | |
| parent | 42c326bc7b96194f73eec02b362208fa1fd4e153 (diff) | |
| parent | 5c2aca9f72fda3d584ac740527c0960ec3e0a8a3 (diff) | |
| download | kernel_samsung_espresso10-11a1ff5d4110e1357f0c77f42091a793010b9ef3.tar.gz kernel_samsung_espresso10-11a1ff5d4110e1357f0c77f42091a793010b9ef3.tar.bz2 kernel_samsung_espresso10-11a1ff5d4110e1357f0c77f42091a793010b9ef3.zip | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
* android-omap-3.0: (38 commits)
OMAP:DSS:DSSCOMP: Avoid freeing a composition twice on set failure
gpu: pvr: Update to DDK 1.8@550175
gpu: pvr: Update to DDK 1.8@334506
OMAP4: McASP: Move device creation to mach-omap2
omap: iovmm: move print to before free in sgtable_free
OMAP4: temp_sensor: update throttling thresholds
OMAP: clock: optimize dpll locking logic
OMAP4: PM: Enable Auto VREF LPDDR I/O supply
ion: fix build
ASoC: omap-mcasp: Simplify device struct retrieval
ASoC: omap-mcasp: Remove wrappers for start/stop
ASoC: omap-mcasp: Remove redundant format check
ASoC: omap-mcasp: Configure the channel status register
ASoC: omap-mcasp: Relax allowed sample rates check
usb: musb: omap2430: use proper signed variables
net: wireless: bcm4329: Skip dhd_bus_stop() if bus is already down
net: wireless: bcmdhd: Skip dhd_bus_stop() if bus is already down
net: wireless: bcmdhd: Improve suspend/resume processing
net: wireless: bcmdhd: Check if FW is Ok for internal FW call
ion: export functions to enable usage by kernel modules
...
Change-Id: I68419e93ae7b91ba33ddba06e853845caebb6905
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 0679c2a218f..6b325c4dafe 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -314,7 +314,7 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev) } dev->idle = 0; - if (dev->rev >= OMAP_I2C_REV_ON_4430) { + if (cpu_is_omap44xx() && dev->rev >= OMAP_I2C_REV_ON_4430) { omap_i2c_write_reg(dev, OMAP_I2C_IRQENABLE_CLR,0x6FFF); omap_i2c_write_reg(dev, OMAP_I2C_IRQENABLE_SET, dev->iestate); } else { @@ -333,7 +333,7 @@ static void omap_i2c_idle(struct omap_i2c_dev *dev) pdev = to_platform_device(dev->dev); pdata = pdev->dev.platform_data; - if (dev->rev >= OMAP_I2C_REV_ON_4430) + if (cpu_is_omap44xx() && dev->rev >= OMAP_I2C_REV_ON_4430) omap_i2c_write_reg(dev, OMAP_I2C_IRQENABLE_CLR, 0x6FFF); else omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0); |