commit 53a6a572138e42b81e33a87b59773e387f369766
author Naresh G Solanki <naresh.solanki@intel.com> Wed Jul 19 11:44:33 2017
committer chrome-bot <chrome-bot@chromium.org> Thu Jul 20 12:37:20 2017
tree 55d53257d582e6218a965aff8b9b1934e91d6eca
parent c9f8fd9b7c6147ad684200f28f355d0e4e794cc6

UPSTREAM: 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: I652d2e84b074b73d98e93ebd204beab4fe70ecdf
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 14deaeec6177cea2829dff977ea67d74ed4aca19
Original-Change-Id: Ib0e08afe0e1b6d8c9961d5e3039b07ada9d30aa3
Original-Signed-off-by: Naresh G Solanki <naresh.solanki@intel.com>
Original-Reviewed-on: https://review.coreboot.org/20646
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/578904
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>

src/soc/intel/common/block/i2c/lpss_i2c.c

diff --git a/src/soc/intel/common/block/i2c/lpss_i2c.c b/src/soc/intel/common/block/i2c/lpss_i2c.c
index 27c7b7f..5b188f8 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 @@
 	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 = &regs->hs_scl_hcnt;
 		lcnt_reg = &regs->hs_scl_lcnt;
 	} else if (config->speed >= I2C_SPEED_FAST) {
-		/* Fast speed */
+		/* Fast and Fast-Plus speed */
 		hcnt_reg = &regs->fs_scl_hcnt;
 		lcnt_reg = &regs->fs_scl_lcnt;
 	} else {
@@ -590,11 +590,11 @@
 	control = read32(&regs->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 */