Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

i2c: tegra: Initialize div-clk rate unconditionally

Browse Source 
It doesn't make sense to conditionalize the div-clk rate changes because
rate is fixed and it won't ever change once it's set at the driver's probe
time. All further changes are NO-OPs because CCF caches rate and skips
rate-change if rate is unchanged.

Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Dmitry Osipenko 2020-09-30 01:18:48 +03:00 committed by Wolfram Sang
parent ed022e5dd3
commit 8548a75f3e
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,7 +293,7 @@ struct tegra_i2c_dev {
bool is_curr_atomic_xfer; bool is_curr_atomic_xfer;
}; };
static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev, bool clk_reinit); static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev);
static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val, static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
unsigned long reg) unsigned long reg)
@ -691,7 +691,7 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
* domain ON. * domain ON.
*/ */
if (i2c_dev->is_vi) { if (i2c_dev->is_vi) {
ret = tegra_i2c_init(i2c_dev, true); ret = tegra_i2c_init(i2c_dev);
if (ret) if (ret)
goto disable_div_clk; goto disable_div_clk;
} }
@ -778,7 +778,7 @@ static void tegra_i2c_vi_init(struct tegra_i2c_dev *i2c_dev)
i2c_writel(i2c_dev, 0x0, I2C_TLOW_SEXT); i2c_writel(i2c_dev, 0x0, I2C_TLOW_SEXT);
} }
static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev, bool clk_reinit) static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
{ {
u32 val; u32 val;
int err; int err;
@ -836,16 +836,14 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev, bool clk_reinit)
if (i2c_dev->hw->has_interface_timing_reg && tsu_thd) if (i2c_dev->hw->has_interface_timing_reg && tsu_thd)
i2c_writel(i2c_dev, tsu_thd, I2C_INTERFACE_TIMING_1); i2c_writel(i2c_dev, tsu_thd, I2C_INTERFACE_TIMING_1);
if (!clk_reinit) { clk_multiplier = tlow + thigh + 2;
clk_multiplier = (tlow + thigh + 2); clk_multiplier *= i2c_dev->clk_divisor_non_hs_mode + 1;
clk_multiplier *= (i2c_dev->clk_divisor_non_hs_mode + 1);
err = clk_set_rate(i2c_dev->div_clk, err = clk_set_rate(i2c_dev->div_clk,
i2c_dev->bus_clk_rate * clk_multiplier); i2c_dev->bus_clk_rate * clk_multiplier);
if (err) { if (err) {
dev_err(i2c_dev->dev, dev_err(i2c_dev->dev, "failed to set div-clk rate: %d\n", err);
"failed changing clock rate: %d\n", err); return err;
return err;
}
} }
if (!i2c_dev->is_dvc && !i2c_dev->is_vi) { if (!i2c_dev->is_dvc && !i2c_dev->is_vi) {
@ -1319,7 +1317,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
if (!time_left && !completion_done(&i2c_dev->dma_complete)) { if (!time_left && !completion_done(&i2c_dev->dma_complete)) {
dev_err(i2c_dev->dev, "DMA transfer timeout\n"); dev_err(i2c_dev->dev, "DMA transfer timeout\n");
tegra_i2c_init(i2c_dev, true); tegra_i2c_init(i2c_dev);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -1340,7 +1338,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
if (time_left == 0) { if (time_left == 0) {
dev_err(i2c_dev->dev, "i2c transfer timed out\n"); dev_err(i2c_dev->dev, "i2c transfer timed out\n");
tegra_i2c_init(i2c_dev, true); tegra_i2c_init(i2c_dev);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -1352,7 +1350,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
if (likely(i2c_dev->msg_err == I2C_ERR_NONE)) if (likely(i2c_dev->msg_err == I2C_ERR_NONE))
return 0; return 0;
tegra_i2c_init(i2c_dev, true); tegra_i2c_init(i2c_dev);
/* start recovery upon arbitration loss in single master mode */ /* start recovery upon arbitration loss in single master mode */
if (i2c_dev->msg_err == I2C_ERR_ARBITRATION_LOST) { if (i2c_dev->msg_err == I2C_ERR_ARBITRATION_LOST) {
if (!i2c_dev->is_multimaster_mode) if (!i2c_dev->is_multimaster_mode)
@ -1811,7 +1809,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
goto disable_div_clk; goto disable_div_clk;
ret = tegra_i2c_init(i2c_dev, false); ret = tegra_i2c_init(i2c_dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to initialize i2c controller\n"); dev_err(&pdev->dev, "Failed to initialize i2c controller\n");
goto release_dma; goto release_dma;
@ -1918,7 +1916,7 @@ static int __maybe_unused tegra_i2c_resume(struct device *dev)
if (err) if (err)
return err; return err;
err = tegra_i2c_init(i2c_dev, false); err = tegra_i2c_init(i2c_dev);
if (err) if (err)
return err; return err;