i2c: tegra: use atomic poll function during configuration
authorShardar Shariff Md <smohammed@nvidia.com>
Wed, 31 Aug 2016 13:28:43 +0000 (18:58 +0530)
committerWolfram Sang <wsa@the-dreams.de>
Thu, 8 Sep 2016 20:34:23 +0000 (22:34 +0200)
Use readl_poll_timeout_atomic() function as *wait_for_config_load()
function can be called from interrupt context.

Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-tegra.c

index daab0ce..2437535 100644 (file)
@@ -457,8 +457,13 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)
                reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD);
                addr = i2c_dev->base + reg_offset;
                i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD);
-               err = readl_poll_timeout(addr, val, val == 0, 1000,
-                                        I2C_CONFIG_LOAD_TIMEOUT);
+               if (in_interrupt())
+                       err = readl_poll_timeout_atomic(addr, val, val == 0,
+                                       1000, I2C_CONFIG_LOAD_TIMEOUT);
+               else
+                       err = readl_poll_timeout(addr, val, val == 0,
+                                       1000, I2C_CONFIG_LOAD_TIMEOUT);
+
                if (err) {
                        dev_warn(i2c_dev->dev,
                                 "timeout waiting for config load\n");