Commit 5e729bc5 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang
Browse files

i2c: designware: Adjust bus_freq_hz when refuse high speed mode set 



When hardware doesn't support High Speed Mode, we forget bus_freq_hz
timing adjustment. This makes the timings and real registers being
unsynchronized. Adjust bus_freq_hz when refuse high speed mode set.

Fixes: b6e67145 ("i2c: designware: Enable high speed mode")
Reported-by: default avatar"Song Bao Hua (Barry Song)" <song.bao.hua@hisilicon.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarBarry Song <song.bao.hua@hisilicon.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 629a411f

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) 
		if ((comp_param1 & DW_IC_COMP_PARAM_1_SPEED_MODE_MASK)

		if ((comp_param1 & DW_IC_COMP_PARAM_1_SPEED_MODE_MASK)

			!= DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH) {

			!= DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH) {

			dev_err(dev->dev, "High Speed not supported!\n");

			dev_err(dev->dev, "High Speed not supported!\n");

			t->bus_freq_hz = I2C_MAX_FAST_MODE_FREQ;

			dev->master_cfg &= ~DW_IC_CON_SPEED_MASK;

			dev->master_cfg &= ~DW_IC_CON_SPEED_MASK;

			dev->master_cfg |= DW_IC_CON_SPEED_FAST;

			dev->master_cfg |= DW_IC_CON_SPEED_FAST;

			dev->hs_hcnt = 0;

			dev->hs_hcnt = 0;