Skip to content

Commit 664d58b

Browse files
Zhuo-hao LeeWolfram Sang
authored andcommitted
i2c: designware: save the preset value of DW_IC_SDA_HOLD
There are several ways to set the SDA hold time for i2c controller, including: Device Tree, built-in device properties and ACPI. However, if the SDA hold time is not specified by above method, we should read the value, where it is preset by firmware, and save it to sda_hold_time. This is needed because when i2c controller enters runtime suspend, the DW_IC_SDA_HOLD value will be reset to chipset default value. And during runtime resume, i2c_dw_init will be called to reconfigure i2c controller. If sda_hold_time is zero, the chipset default hold time will be used, that will be too short for some platforms. Therefore, to have a better tolerance, the DW_IC_SDA_HOLD value should be kept by sda_hold_time. Signed-off-by: Zhuo-hao Lee <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent 30851a7 commit 664d58b

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,13 +367,17 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
367367
dev_dbg(dev->dev, "Fast-mode HCNT:LCNT = %d:%d\n", hcnt, lcnt);
368368

369369
/* Configure SDA Hold Time if required */
370-
if (dev->sda_hold_time) {
371-
reg = dw_readl(dev, DW_IC_COMP_VERSION);
372-
if (reg >= DW_IC_SDA_HOLD_MIN_VERS)
370+
reg = dw_readl(dev, DW_IC_COMP_VERSION);
371+
if (reg >= DW_IC_SDA_HOLD_MIN_VERS) {
372+
if (dev->sda_hold_time) {
373373
dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD);
374-
else
375-
dev_warn(dev->dev,
376-
"Hardware too old to adjust SDA hold time.");
374+
} else {
375+
/* Keep previous hold time setting if no one set it */
376+
dev->sda_hold_time = dw_readl(dev, DW_IC_SDA_HOLD);
377+
}
378+
} else {
379+
dev_warn(dev->dev,
380+
"Hardware too old to adjust SDA hold time.\n");
377381
}
378382

379383
/* Configure Tx/Rx FIFO threshold levels */

0 commit comments

Comments
 (0)