Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ce7610e authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Wolfram Sang
Browse files

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 3bd4f277 ("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: 3bd4f277 ("i2c: designware: Call i2c_dw_clk_rate() only once in i2c_dw_init_master()")
Reported-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: <stable@vger.kernel.org> # 4.19
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 08d9db00

drivers/i2c/busses/i2c-designware-master.c

+3 −1
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ static void i2c_dw_configure_fifo_master(struct dw_i2c_dev *dev) 


static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev)

{

	u32 ic_clk = i2c_dw_clk_rate(dev);

	const char *mode_str, *fp_str = "";

	u32 comp_param1;

	u32 sda_falling_time, scl_falling_time;

	struct i2c_timings *t = &dev->timings;

	u32 ic_clk;

	int ret;



	ret = i2c_dw_acquire_lock(dev);
@@ -53,6 +53,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) 


	/* Calculate SCL timing parameters for standard mode if not set */

	if (!dev->ss_hcnt || !dev->ss_lcnt) {

		ic_clk = i2c_dw_clk_rate(dev);

		dev->ss_hcnt =

			i2c_dw_scl_hcnt(ic_clk,

					4000,	/* tHD;STA = tHIGH = 4.0 us */
@@ -89,6 +90,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) 
	 * needed also in high speed mode.

	 */

	if (!dev->fs_hcnt || !dev->fs_lcnt) {

		ic_clk = i2c_dw_clk_rate(dev);

		dev->fs_hcnt =

			i2c_dw_scl_hcnt(ic_clk,

					600,	/* tHD;STA = tHIGH = 0.6 us */