coil: i2cs -> i2cp

Rename i2cs functionas and variables to i2cp. Change some basic
comments.

I will rework the i2cp comments to stop using controller when referring
to the i2cp, because it's kind of confusing now that master has been
renamed to controller.

BUG=b:175244613
TEST=make buildall -j

Change-Id: I9574e77ab42427ca90d5b8a6421793f52e519f67
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2611761
Reviewed-by: Namyoon Woo <namyoon@chromium.org>

3 files changed, 11 insertions, 11 deletions

diff --git a/board/cr50/board.c b/board/cr50/board.c
index d9720956de..0dd9e5ef5d 100644
--- a/board/cr50/board.c
+++ b/board/cr50/board.c
@@ -1577,7 +1577,7 @@ static void init_board_properties(void)
 }
 DECLARE_HOOK(HOOK_INIT, init_board_properties, HOOK_PRIO_FIRST);
 
-void i2cs_set_pinmux(void)
+void i2cp_set_pinmux(void)
 {
 	/* Connect I2CS SDA/SCL output to A1/A9 pads */
 	GWRITE(PINMUX, DIOA1_SEL, GC_PINMUX_I2CS0_SDA_SEL);
@@ -1806,17 +1806,17 @@ void board_start_ite_sync(void)
 	hook_call_deferred(&deferred_ite_sync_reset_data, 10 * MSEC);
 }
 
-void board_unwedge_i2cs(void)
+void board_unwedge_i2cp(void)
 {
 	/*
-	 * Create connection between i2cs_scl and the 'unwedge_scl' GPIO, and
-	 * generate the i2c stop sequence which will reset the i2cs FSM.
+	 * Create connection between i2cp_scl and the 'unwedge_scl' GPIO, and
+	 * generate the i2c stop sequence which will reset the i2cp FSM.
 	 *
-	 * First, disconnect the external pin from the i2cs_scl input.
+	 * First, disconnect the external pin from the i2cp_scl input.
 	 */
 	GWRITE(PINMUX, DIOA9_SEL, 0);
 
-	/* Connect the 'unwedge' GPIO to the i2cs_scl input. */
+	/* Connect the 'unwedge' GPIO to the i2cp_scl input. */
 	GWRITE(PINMUX, GPIO1_GPIO5_SEL, GC_PINMUX_I2CS0_SCL_SEL);
 
 	/* Generate a 'stop' condition. */
@@ -1830,7 +1830,7 @@ void board_unwedge_i2cs(void)
 	/* Disconnect the 'unwedge' mode SCL. */
 	GWRITE(PINMUX, GPIO1_GPIO5_SEL, 0);
 
-	/* Restore external pin connection to the i2cs_scl. */
+	/* Restore external pin connection to the i2cp_scl. */
 	GWRITE(PINMUX, DIOA9_SEL, GC_PINMUX_I2CS0_SCL_SEL);
 }
 
diff --git a/board/cr50/board.h b/board/cr50/board.h
index 69e2a5d1a7..bf54ba7c9f 100644
--- a/board/cr50/board.h
+++ b/board/cr50/board.h
@@ -426,10 +426,10 @@ void board_start_ite_sync(void);
 
 /*
  * Board specific function (needs information about pinmux settings) which
- * allows to take the i2cs controller out of the 'wedged' state where the
+ * allows to take the i2cp controller out of the 'wedged' state where the
  * master stopped i2c access mid transaction and the slave is holding SDA low,
  */
-void board_unwedge_i2cs(void);
+void board_unwedge_i2cp(void);
 
 int board_in_prod_mode(void);
 
diff --git a/board/cr50/gpio.inc b/board/cr50/gpio.inc
index e527f7815b..0efac639aa 100644
--- a/board/cr50/gpio.inc
+++ b/board/cr50/gpio.inc
@@ -116,7 +116,7 @@ GPIO_INT(DETECT_TPM_RST_L_ASSERTED, PIN(1, 4),  GPIO_INT_FALLING,
  * Also, it works to detect an I2C transaction during extended INT_AP_L
  * assertion.
  */
-GPIO_INT(MONITOR_I2CS_SDA, PIN(1, 6), GPIO_INT_LOW, i2cs_sda_isr)
+GPIO_INT(MONITOR_I2CS_SDA, PIN(1, 6), GPIO_INT_LOW, i2cp_sda_isr)
 
 /*
  * These GPIOs are to enable or disable EC-CR50 communication.
@@ -294,7 +294,7 @@ PINMUX(GPIO(DETECT_SERVO),      B5, DIO_INPUT)
  * A1 is also used as a strapping option GPIO input which is configured
  * above. If a board is configured (via the strapping pins) to support the I2CS
  * interface, then the connection of A1 and A9 to/from the I2C0_SDA and I2C0_SCL
- * lines is done in the function i2cs_set_pinmux() which lives in board.c.
+ * lines is done in the function i2cp_set_pinmux() which lives in board.c.
  *
  * PINMUX(FUNC(I2C0_SCL),        A9, DIO_INPUT)
  * PINMUX(FUNC(I2C0_SDA),        A1, DIO_INPUT)