From 14deaeec6177cea2829dff977ea67d74ed4aca19 Mon Sep 17 00:00:00 2001 From: Naresh G Solanki Date: Wed, 19 Jul 2017 17:14:33 +0530 Subject: intel/common/block/i2c: Fix clock programming of i2c When configuring i2c frequency to I2C_SPEED_FAST_PLUS, observed frequency was I2C_SPEED_FAST. This was due to incorrect register programming. TEST= Build for Soraka, I2C frequency during firmware execution was I2C_SPEED_FAST_PLUS when configured for I2C_SPEED_FAST_PLUS. Change-Id: Ib0e08afe0e1b6d8c9961d5e3039b07ada9d30aa3 Signed-off-by: Naresh G Solanki Reviewed-on: https://review.coreboot.org/20646 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh --- src/soc/intel/common/block/i2c/lpss_i2c.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/soc/intel/common/block') diff --git a/src/soc/intel/common/block/i2c/lpss_i2c.c b/src/soc/intel/common/block/i2c/lpss_i2c.c index 27c7b7f040..5b188f8c22 100644 --- a/src/soc/intel/common/block/i2c/lpss_i2c.c +++ b/src/soc/intel/common/block/i2c/lpss_i2c.c @@ -407,12 +407,12 @@ static int lpss_i2c_set_speed_config(unsigned int bus, if (!config->scl_lcnt && !config->scl_hcnt && !config->sda_hold) return 0; - if (config->speed >= I2C_SPEED_FAST_PLUS) { - /* Fast-Plus and High speed */ + if (config->speed >= I2C_SPEED_HIGH) { + /* High and Fast Ultra speed */ hcnt_reg = ®s->hs_scl_hcnt; lcnt_reg = ®s->hs_scl_lcnt; } else if (config->speed >= I2C_SPEED_FAST) { - /* Fast speed */ + /* Fast and Fast-Plus speed */ hcnt_reg = ®s->fs_scl_hcnt; lcnt_reg = ®s->fs_scl_lcnt; } else { @@ -590,11 +590,11 @@ static int lpss_i2c_set_speed(unsigned int bus, enum i2c_speed speed, control = read32(®s->control); control &= ~CONTROL_SPEED_MASK; - if (speed >= I2C_SPEED_FAST_PLUS) { - /* High and Fast-Plus speed share config registers */ + if (speed >= I2C_SPEED_HIGH) { + /* High and Fast-Ultra speed share config registers */ control |= CONTROL_SPEED_HS; } else if (speed >= I2C_SPEED_FAST) { - /* Fast speed */ + /* Fast speed and Fast-Plus */ control |= CONTROL_SPEED_FS; } else { /* Standard speed */ -- cgit v1.2.3