diff options
| author | srinidhi kasagar <srinidhi.kasagar@stericsson.com> | 2009-12-10 14:58:29 +0530 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:43:48 -0600 |
| commit | c66d7998993c08728d01e8738ad69e3d2a060c10 (patch) | |
| tree | d4eb97d54e1e30ab6edbace15837b12c61dfc494 /drivers/i2c/busses | |
| parent | d1451ddbc82af8cf0eea33c2dd3fb0c2c9e24add (diff) | |
v1 i2c: FS bit only available in db8500v1
Force Stop enable feature introduced in v1
Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-stm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-stm.c b/drivers/i2c/busses/i2c-stm.c index 7ee5f18452e..c48957cb249 100644 --- a/drivers/i2c/busses/i2c-stm.c +++ b/drivers/i2c/busses/i2c-stm.c @@ -86,7 +86,8 @@ static inline u32 create_irq_mask(int bus_num, u32 flags) irq_mask = ((0x1UL << 29) | (0x1UL << 30) | flags); break; case 4: - irq_mask = ((0x1UL << 29) | (0x1UL << 30) | (0x1UL << 31) | flags); + irq_mask = ((0x1UL << 29) | (0x1UL << 30) | (0x1UL << 31) + | flags); break; default: stm_error("Illegal I2C bus\n"); @@ -252,7 +253,8 @@ static inline u32 get_i2c_cntlr_reg_cfg(struct i2c_driver_data *priv) cr |= GEN_MASK(0, I2C_CR_DMA_SLE, I2C_CR_DMA_SLE_POS); cr |= GEN_MASK(0, I2C_CR_FON, I2C_CR_FON_POS); cr |= GEN_MASK(1, I2C_CR_PE, I2C_CR_PE_POS); - cr |= GEN_MASK(0, I2C_CR_FS, I2C_CR_FS_POS); + if (!u8500_is_earlydrop()) + cr |= GEN_MASK(0, I2C_CR_FS, I2C_CR_FS_POS); /* modified for touch screen client */ if (priv->adap.nr == 3) cr |= 0x10; |