]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
i2c: tegra: Fix runtime resume to re-init VI I2C
authorSowjanya Komatineni <skomatineni@nvidia.com>
Mon, 27 Jul 2020 20:57:22 +0000 (13:57 -0700)
committerWolfram Sang <wsa@kernel.org>
Tue, 28 Jul 2020 16:32:32 +0000 (18:32 +0200)
VI I2C is on host1x bus and is part of VE power domain.

During suspend/resume VE power domain goes through power off/on.

So, controller reset followed by i2c re-initialization is required
after the domain power up.

This patch fixes it.

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-tegra.c

index 7b93c454b4c750dfca6f01fe163df08d61b276c7..1bf36669ca67eddee7600ef498e788274e4e774f 100644 (file)
@@ -293,6 +293,8 @@ struct tegra_i2c_dev {
        bool is_curr_atomic_xfer;
 };
 
+static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev, bool clk_reinit);
+
 static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
                       unsigned long reg)
 {
@@ -675,8 +677,22 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
                goto disable_slow_clk;
        }
 
+       /*
+        * VI I2C device is attached to VE power domain which goes through
+        * power ON/OFF during PM runtime resume/suspend. So, controller
+        * should go through reset and need to re-initialize after power
+        * domain ON.
+        */
+       if (i2c_dev->is_vi) {
+               ret = tegra_i2c_init(i2c_dev, true);
+               if (ret)
+                       goto disable_div_clk;
+       }
+
        return 0;
 
+disable_div_clk:
+       clk_disable(i2c_dev->div_clk);
 disable_slow_clk:
        clk_disable(i2c_dev->slow_clk);
 disable_fast_clk: