Commit 664d58bf authored Aug 27, 2016 by Zhuo-hao Lee Committed by Wolfram Sang Sep 08, 2016

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 <zhuo-hao.lee@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

parent 30851a7c

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -367,13 +367,17 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
		dev_dbg(dev->dev, "Fast-mode HCNT:LCNT = %d:%d\n", hcnt, lcnt);

		/* Configure SDA Hold Time if required */
		if (dev->sda_hold_time) {
		reg = dw_readl(dev, DW_IC_COMP_VERSION);
		if (reg >= DW_IC_SDA_HOLD_MIN_VERS)
		if (reg >= DW_IC_SDA_HOLD_MIN_VERS) {
		if (dev->sda_hold_time) {
		dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD);
		else
		} else {
		/* Keep previous hold time setting if no one set it */
		dev->sda_hold_time = dw_readl(dev, DW_IC_SDA_HOLD);
		}
		} else {
		dev_warn(dev->dev,
		"Hardware too old to adjust SDA hold time.");
		"Hardware too old to adjust SDA hold time.\n");
		}

		/* Configure Tx/Rx FIFO threshold levels */