FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-01 14:52:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i2c: tegra: use readl_poll_timeout after config_load reg programmed

Browse Source 
After CONFIG_LOAD register is programmed instead of explicitly waiting
for timeout, use readl_poll_timeout() to check for register value to get
updated or wait till timeout.

Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Shardar Shariff Md 2016-08-31 18:58:40 +05:30 committed by Wolfram Sang
parent 17f80487f6
commit 685143a159
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/i2c/busses/i2c-tegra.c
View File

@ -30,6 +30,7 @@
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/pinctrl/consumer.h> #include <linux/pinctrl/consumer.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/iopoll.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
@ -112,6 +113,8 @@
#define I2C_CLKEN_OVERRIDE 0x090 #define I2C_CLKEN_OVERRIDE 0x090
#define I2C_MST_CORE_CLKEN_OVR BIT(0) #define I2C_MST_CORE_CLKEN_OVR BIT(0)
#define I2C_CONFIG_LOAD_TIMEOUT 1000000
/* /*
* msg_end_type: The bus control which need to be send at end of transfer. * msg_end_type: The bus control which need to be send at end of transfer.
* @MSG_END_STOP: Send stop pulse at end of transfer. * @MSG_END_STOP: Send stop pulse at end of transfer.
@ -448,7 +451,6 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
u32 val; u32 val;
int err; int err;
u32 clk_divisor; u32 clk_divisor;
unsigned long timeout = jiffies + HZ;
err = pm_runtime_get_sync(i2c_dev->dev); err = pm_runtime_get_sync(i2c_dev->dev);
if (err < 0) { if (err < 0) {
@ -497,15 +499,18 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
i2c_writel(i2c_dev, I2C_MST_CORE_CLKEN_OVR, I2C_CLKEN_OVERRIDE); i2c_writel(i2c_dev, I2C_MST_CORE_CLKEN_OVR, I2C_CLKEN_OVERRIDE);
if (i2c_dev->hw->has_config_load_reg) { 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); i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD);
while (i2c_readl(i2c_dev, I2C_CONFIG_LOAD) != 0) { err = readl_poll_timeout(addr, val, val == 0, 1000,
if (time_after(jiffies, timeout)) { I2C_CONFIG_LOAD_TIMEOUT);
dev_warn(i2c_dev->dev, if (err) {
"timeout waiting for config load\n"); dev_warn(i2c_dev->dev,
err = -ETIMEDOUT; "timeout waiting for config load\n");
goto err; goto err;
}
msleep(1);
} }
} }