diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-03 16:07:06 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-03 16:07:06 +0530 |
| commit | 95edf05b06bc9622176fcafe1c96dd168e7fb147 (patch) | |
| tree | fe20eb31b9c3392b9a871ec01f11a3d7e0964015 /drivers/i2c | |
| parent | 1069541032e997728f1786b44507961a09d24f7f (diff) | |
| parent | 0a11e95053a055d80be6184c51b82ea7e05c7cda (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Change-Id: I7299b3bed83fbf41f5666724e328980cfcda1186
Diffstat (limited to 'drivers/i2c')
| -rwxr-xr-x[-rw-r--r--] | drivers/i2c/busses/i2c-tegra.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 60cdc4b73bd3..b64d66d39852 100644..100755 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -35,6 +35,7 @@ #define BYTES_PER_FIFO_WORD 4 #define I2C_CNFG 0x000 +#define I2C_CNFG_DEBOUNCE_CNT_SHIFT 12 #define I2C_CNFG_PACKET_MODE_EN (1<<10) #define I2C_CNFG_NEW_MASTER_FSM (1<<11) #define I2C_STATUS 0x01C @@ -312,7 +313,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) if (i2c_dev->is_dvc) tegra_dvc_init(i2c_dev); - val = I2C_CNFG_NEW_MASTER_FSM | I2C_CNFG_PACKET_MODE_EN; + val = I2C_CNFG_NEW_MASTER_FSM | I2C_CNFG_PACKET_MODE_EN | (0x2 << I2C_CNFG_DEBOUNCE_CNT_SHIFT); i2c_writel(i2c_dev, val, I2C_CNFG); i2c_writel(i2c_dev, 0, I2C_INT_MASK); tegra_i2c_set_clk(i2c_dev, i2c_dev->last_bus_clk); |