diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2018-10-01 07:49:05 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2018-10-05 07:40:05 -0400 |
commit | 9ce7610e6d201e3923c0b2f454f2e1d54f5da49e (patch) | |
tree | 9cb5f7d68703b30af79028e3d58e49559a05248e | |
parent | 08d9db00fe0e300d6df976e6c294f974988226dd (diff) |
i2c: designware: Call i2c_dw_clk_rate() only when calculating timings
There are platforms which don't provide input clock rate but provide
I2C timing parameters. Commit 3bd4f277274b ("i2c: designware: Call
i2c_dw_clk_rate() only once in i2c_dw_init_master()") causes needless
warning during probe on those platforms since i2c_dw_clk_rate(), which
causes the warning when input clock is unknown, is called even when
there is no need to calculate timing parameters.
Fixes: 3bd4f277274b ("i2c: designware: Call i2c_dw_clk_rate() only once in i2c_dw_init_master()")
Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: <stable@vger.kernel.org> # 4.19
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r-- | drivers/i2c/busses/i2c-designware-master.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index 94d94b4a9a0d..18cc324f3ca9 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c | |||
@@ -34,11 +34,11 @@ static void i2c_dw_configure_fifo_master(struct dw_i2c_dev *dev) | |||
34 | 34 | ||
35 | static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) | 35 | static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) |
36 | { | 36 | { |
37 | u32 ic_clk = i2c_dw_clk_rate(dev); | ||
38 | const char *mode_str, *fp_str = ""; | 37 | const char *mode_str, *fp_str = ""; |
39 | u32 comp_param1; | 38 | u32 comp_param1; |
40 | u32 sda_falling_time, scl_falling_time; | 39 | u32 sda_falling_time, scl_falling_time; |
41 | struct i2c_timings *t = &dev->timings; | 40 | struct i2c_timings *t = &dev->timings; |
41 | u32 ic_clk; | ||
42 | int ret; | 42 | int ret; |
43 | 43 | ||
44 | ret = i2c_dw_acquire_lock(dev); | 44 | ret = i2c_dw_acquire_lock(dev); |
@@ -53,6 +53,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) | |||
53 | 53 | ||
54 | /* Calculate SCL timing parameters for standard mode if not set */ | 54 | /* Calculate SCL timing parameters for standard mode if not set */ |
55 | if (!dev->ss_hcnt || !dev->ss_lcnt) { | 55 | if (!dev->ss_hcnt || !dev->ss_lcnt) { |
56 | ic_clk = i2c_dw_clk_rate(dev); | ||
56 | dev->ss_hcnt = | 57 | dev->ss_hcnt = |
57 | i2c_dw_scl_hcnt(ic_clk, | 58 | i2c_dw_scl_hcnt(ic_clk, |
58 | 4000, /* tHD;STA = tHIGH = 4.0 us */ | 59 | 4000, /* tHD;STA = tHIGH = 4.0 us */ |
@@ -89,6 +90,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) | |||
89 | * needed also in high speed mode. | 90 | * needed also in high speed mode. |
90 | */ | 91 | */ |
91 | if (!dev->fs_hcnt || !dev->fs_lcnt) { | 92 | if (!dev->fs_hcnt || !dev->fs_lcnt) { |
93 | ic_clk = i2c_dw_clk_rate(dev); | ||
92 | dev->fs_hcnt = | 94 | dev->fs_hcnt = |
93 | i2c_dw_scl_hcnt(ic_clk, | 95 | i2c_dw_scl_hcnt(ic_clk, |
94 | 600, /* tHD;STA = tHIGH = 0.6 us */ | 96 | 600, /* tHD;STA = tHIGH = 0.6 us */ |