aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Cheng <jacheng@nvidia.com>2011-04-25 17:32:27 -0400
committerBen Dooks <ben-linux@fluff.org>2011-05-11 01:45:50 -0400
commit40abcf772357355a04f966416eebc943fd0281d4 (patch)
tree1388653b71196c3523d16b4be4bf1553545e2cd4
parent2078cf3b2230cc2ee456e67d28dd9a869097e1ff (diff)
i2c: tegra: Add de-bounce cycles.
This enables debouncing of the I2C lines. The debounce period is 2 * the debounce register field value, in terms of the I2C block's main clock. The Tegra TRM indicates that a setting yielding >50nS is desirable. Hence, a setting of 2 => 4 clocks @ 72MHz => ~55nS. Signed-off-by: Ken Radtke <kradtke@nvidia.com> [swarren: Added commit description body, Fixed 80-column limit, Reverted file permission change] Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--drivers/i2c/busses/i2c-tegra.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 6b69b7007f00..4d9319665e32 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -35,6 +35,7 @@
35#define BYTES_PER_FIFO_WORD 4 35#define BYTES_PER_FIFO_WORD 4
36 36
37#define I2C_CNFG 0x000 37#define I2C_CNFG 0x000
38#define I2C_CNFG_DEBOUNCE_CNT_SHIFT 12
38#define I2C_CNFG_PACKET_MODE_EN (1<<10) 39#define I2C_CNFG_PACKET_MODE_EN (1<<10)
39#define I2C_CNFG_NEW_MASTER_FSM (1<<11) 40#define I2C_CNFG_NEW_MASTER_FSM (1<<11)
40#define I2C_STATUS 0x01C 41#define I2C_STATUS 0x01C
@@ -328,7 +329,8 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
328 if (i2c_dev->is_dvc) 329 if (i2c_dev->is_dvc)
329 tegra_dvc_init(i2c_dev); 330 tegra_dvc_init(i2c_dev);
330 331
331 val = I2C_CNFG_NEW_MASTER_FSM | I2C_CNFG_PACKET_MODE_EN; 332 val = I2C_CNFG_NEW_MASTER_FSM | I2C_CNFG_PACKET_MODE_EN |
333 (0x2 << I2C_CNFG_DEBOUNCE_CNT_SHIFT);
332 i2c_writel(i2c_dev, val, I2C_CNFG); 334 i2c_writel(i2c_dev, val, I2C_CNFG);
333 i2c_writel(i2c_dev, 0, I2C_INT_MASK); 335 i2c_writel(i2c_dev, 0, I2C_INT_MASK);
334 clk_set_rate(i2c_dev->clk, i2c_dev->bus_clk_rate * 8); 336 clk_set_rate(i2c_dev->clk, i2c_dev->bus_clk_rate * 8);