Skip to contentSkip to conversation

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

PATCH Applied Andy Shevchenko 3 participants 4 messages Mar 31, 2021 – Apr 5, 2021

Subsystems (3)
lore
Share & tools
lore

Andy Shevchenko

author reviewer
#0 lore raw

PATCH 1/1 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 b6e67145f149 ("i2c: designware: Enable high speed mode")
---
 drivers/i2c/busses/i2c-designware-master.c | 1 +
 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-designware-master.c +1 -0
index 34bb4e21bcc3..9bfa06e31eec 100644
@@ -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)
 			!= DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH) {
 			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_FAST;
 			dev->hs_hcnt = 0;
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines

-----Original Message-----
From: Andy Shevchenko [mailto:[email protected]]
Sent: Thursday, April 1, 2021 12:05 AM
To: Andy Shevchenko <[email protected]>; Serge Semin <[email protected]>; [email protected]; [email protected]
Cc: Jarkko Nikula <[email protected]>; Mika Westerberg <[email protected]>; [email protected]; yangyicong <[email protected]>; Song Bao Hua (Barry Song) <[email protected]>
Subject: [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set

Quoted 8 lines

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 b6e67145f149 ("i2c: designware: Enable high speed mode")

---

Thanks for fixing that.

Quoted 19 lines
 drivers/i2c/busses/i2c-designware-master.c | 1 +
 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-designware-master.c +1 -0
index 34bb4e21bcc3..9bfa06e31eec 100644
@@ -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)
 			!= DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH) {
 			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_FAST;

dev->hs_hcnt = 0;
--
2.30.2

author reviewer
#2 lore raw
Quoted 5 lines · Song Bao Hua (Barry Song)
Quoted 5 lines

From: Andy Shevchenko [mailto:[email protected]]
Sent: Thursday, April 1, 2021 12:05 AM
To: Andy Shevchenko <[email protected]>; Serge Semin <[email protected]>; [email protected]; [email protected]

...

Quoted 7 lines
Quoted 3 lines
Fixes b6e67145f149 ("i2c: designware: Enable high speed mode")

Thanks for fixing that.

Thanks!
Wolfram, can be this applied for v5.12-rc7?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
Applied
#3 lore raw
In reply to Andy Shevchenko
Quoted 7 lines · Andy Shevchenko

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 b6e67145f149 ("i2c: designware: Enable high speed mode")

Applied to for-current, thanks!