diff options
| author | Shardar Shariff Md <smohammed@nvidia.com> | 2016-08-31 18:58:42 +0530 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2016-09-08 22:33:51 +0200 |
| commit | 89120d66fce9b6df4b9300fab373676648994cb8 (patch) | |
| tree | 87d2b8e4bf58d273a431d889908f91bc25ed2732 /drivers/i2c | |
| parent | 2148c01ccea9203a153eadadf068c1be5a935495 (diff) | |
| download | linux-89120d66fce9b6df4b9300fab373676648994cb8.tar.gz | |
i2c: tegra: add separate function for config_load programing
Define separate function for configuration load register handling
to make it use by different functions later.
Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 07a39b7c293a..daab0cea20b4 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -446,6 +446,29 @@ static int tegra_i2c_runtime_suspend(struct device *dev) return pinctrl_pm_select_idle_state(i2c_dev->dev); } +static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev) +{ + unsigned long reg_offset; + void __iomem *addr; + u32 val; + int err; + + if (i2c_dev->hw->has_config_load_reg) { + 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 (err) { + dev_warn(i2c_dev->dev, + "timeout waiting for config load\n"); + return err; + } + } + + return 0; +} + static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) { u32 val; @@ -500,21 +523,9 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) if (i2c_dev->is_multimaster_mode && i2c_dev->hw->has_slcg_override_reg) i2c_writel(i2c_dev, I2C_MST_CORE_CLKEN_OVR, I2C_CLKEN_OVERRIDE); - if (i2c_dev->hw->has_config_load_reg) { - unsigned long reg_offset; - void __iomem *addr; - - 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 (err) { - dev_warn(i2c_dev->dev, - "timeout waiting for config load\n"); - goto err; - } - } + err = tegra_i2c_wait_for_config_load(i2c_dev); + if (err) + goto err; if (i2c_dev->irq_disabled) { i2c_dev->irq_disabled = 0; |