diff options
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index ad12f75bbdbf..bde4a6dd8e33 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -151,6 +151,7 @@ struct tegra_i2c_dev { struct clk *fast_clk; struct resource *iomem; struct rt_mutex dev_lock; + spinlock_t fifo_lock; void __iomem *base; int cont_id; int irq; @@ -320,6 +321,9 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev) u8 *buf = i2c_dev->msg_buf; size_t buf_remaining = i2c_dev->msg_buf_remaining; int words_to_transfer; + unsigned long flags; + + spin_lock_irqsave(&i2c_dev->fifo_lock, flags); val = i2c_readl(i2c_dev, I2C_FIFO_STATUS); tx_fifo_avail = (val & I2C_FIFO_STATUS_TX_MASK) >> @@ -369,6 +373,8 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev) i2c_writel(i2c_dev, val, I2C_TX_FIFO); } + spin_unlock_irqrestore(&i2c_dev->fifo_lock, flags); + return 0; } @@ -885,6 +891,7 @@ static int tegra_i2c_probe(struct platform_device *pdev) i2c_dev->msgs = NULL; i2c_dev->msgs_num = 0; rt_mutex_init(&i2c_dev->dev_lock); + spin_lock_init(&i2c_dev->fifo_lock); i2c_dev->slave_addr = plat->slave_addr; i2c_dev->hs_master_code = plat->hs_master_code; |