COIL: Remove unused mchp i2c function

Remove i2c function and data structures which are currently unused in
the codebase.  The calling location of this function was removed in
2018.  This commit also updates comments in the board header files which
were using the function.

BRANCH=None
BUG=None
TEST=make -j buildall

Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: I46cd0d95e750489b633a99dde56e267562f577e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2697858
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

6 files changed, 6 insertions, 124 deletions

diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c
index f9c74c89fe..00bab0fbc2 100644
--- a/board/mchpevb1/board.c
+++ b/board/mchpevb1/board.c
@@ -272,40 +272,6 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = {
 };
 #endif
 
-const uint32_t i2c_ctrl_slave_addrs[I2C_CONTROLLER_COUNT] = {
-#ifdef CONFIG_BOARD_MCHP_I2C0_SLAVE_ADDRS
-	(MCHP_I2C_CTRL0 + (CONFIG_BOARD_MCHP_I2C0_SLAVE_ADDRS << 16)),
-#else
-	(MCHP_I2C_CTRL0 + (CONFIG_MCHP_I2C0_SLAVE_ADDRS << 16)),
-#endif
-#ifdef CONFIG_BOARD_MCHP_I2C1_SLAVE_ADDRS
-	(MCHP_I2C_CTRL1 + (CONFIG_BOARD_MCHP_I2C1_SLAVE_ADDRS << 16)),
-#else
-	(MCHP_I2C_CTRL1 + (CONFIG_MCHP_I2C1_SLAVE_ADDRS << 16)),
-#endif
-};
-
-/* Return the two slave addresses the specified
- * controller will respond to when controller
- * is acting as a slave.
- * b[6:0]  = b[7:1] of I2C address 1
- * b[14:8] = b[7:1] of I2C address 2
- * When not using I2C controllers as slaves we can use
- * the same value for all controllers. The address should
- * not be 0x00 as this is the general call address.
- */
-uint16_t board_i2c_slave_addrs(int controller)
-{
-	int i;
-
-	for (i = 0; i < I2C_CONTROLLER_COUNT; i++)
-		if ((i2c_ctrl_slave_addrs[i] & 0xffff) == controller)
-			return (i2c_ctrl_slave_addrs[i] >> 16);
-
-	return CONFIG_MCHP_I2C0_SLAVE_ADDRS;
-}
-
-
 /* SPI devices */
 const struct spi_device_t spi_devices[] = {
 	{ QMSPI0_PORT, 4, GPIO_QMSPI_CS0},
diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h
index 25e12b2eb3..24b3b4ffed 100644
--- a/board/mchpevb1/board.h
+++ b/board/mchpevb1/board.h
@@ -97,17 +97,17 @@
  * #define CONFIG_DEBUG_DISABLE_WRITE_BUFFER
  */
 
-/* New eSPI slave configuration items */
+/* New eSPI configuration items */
 
 /*
- * Maximum clock frequence eSPI EC slave advertises
+ * Maximum clock frequence eSPI EC advertises
  * Values in MHz are 20, 25, 33, 50, and 66
  */
 /* KBL + EVB fly-wire hook up only supports 20MHz */
 #define CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ		20
 
 /*
- * EC eSPI slave advertises IO lanes
+ * EC eSPI advertises IO lanes
  * 0 = Single
  * 1 = Single and Dual
  * 2 = Single and Quad
@@ -479,14 +479,6 @@ enum als_id {
 /* Map I2C port to controller */
 int board_i2c_p2c(int port);
 
-/* Return the two slave addresses the specified
- * controller will respond to when controller
- * is acting as a slave.
- * b[6:0]  = b[7:1] of I2C address 1
- * b[14:8] = b[7:1] of I2C address 2
- */
-uint16_t board_i2c_slave_addrs(int controller);
-
 /* Reset PD MCU */
 void board_reset_pd_mcu(void);
 
diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c
index c63cee981a..feb363156e 100644
--- a/board/reef_mchp/board.c
+++ b/board/reef_mchp/board.c
@@ -232,16 +232,6 @@ const uint16_t i2c_port_to_ctrl[I2C_PORT_COUNT] = {
 	(MCHP_I2C_CTRL3 << 8) + MCHP_I2C_PORT7,
 };
 
-/*
- * Used by chip level I2C controller initialization.
- * Board level can specify two unused I2C addresses
- * for each controller. Current chip level disables
- * controller response to address 0(general call).
- */
-const uint32_t i2c_ctrl_slave_addrs[I2C_CONTROLLER_COUNT] = {
-	0, 0, 0, 0,
-};
-
 const struct charger_config_t chg_chips[] = {
 	{
 		.i2c_port = I2C_PORT_CHARGER,
@@ -250,26 +240,6 @@ const struct charger_config_t chg_chips[] = {
 	},
 };
 
-/* Return the two slave addresses the specified
- * controller will respond to when controller
- * is acting as a slave.
- * b[6:0]  = b[7:1] of I2C address 1
- * b[14:8] = b[7:1] of I2C address 2
- * When not using I2C controllers as slaves we can use
- * the same value for all controllers. The address should
- * not be 0x00 as this is the general call address.
- */
-uint16_t board_i2c_slave_addrs(int controller)
-{
-	int i;
-
-	for (i = 0; i < I2C_CONTROLLER_COUNT; i++)
-		if ((i2c_ctrl_slave_addrs[i] & 0xffff) == controller)
-			return (i2c_ctrl_slave_addrs[i] >> 16);
-
-	return 0; /* general call address */
-}
-
 /*
  * default to I2C0 because callers may not check
  * return value if we returned an error code.
@@ -420,7 +390,7 @@ static int ps8751_tune_mux(const struct usb_mux *me)
 /*
  * USB_PD_PORT_ANX74XX and USB_PD_PORT_PS8751 are zero based indices into
  * tcpc_config array. The tcpc_config array contains the actual EC I2C
- * port, device slave address, and a function pointer into the driver code.
+ * port, device address, and a function pointer into the driver code.
  */
 const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = {
 	[USB_PD_PORT_ANX74XX] = {
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index 01ec4aa79c..fedfc82edd 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -316,14 +316,6 @@ void board_print_tcpc_fw_version(int port);
 /* Map I2C port to controller */
 int board_i2c_p2c(int port);
 
-/* Return the two slave addresses the specified
- * controller will respond to when controller
- * is acting as a slave.
- * b[6:0]  = b[7:1] of I2C address 1
- * b[14:8] = b[7:1] of I2C address 2
- */
-uint16_t board_i2c_slave_addrs(int controller);
-
 /* MCHP - firwmare-reef-9042.B does have LID_ALS bit
  * because its using TASK_ALS ?
  */
diff --git a/board/sklrvp_mchp/board.c b/board/sklrvp_mchp/board.c
index c033c2bd7c..d7fb99e565 100644
--- a/board/sklrvp_mchp/board.c
+++ b/board/sklrvp_mchp/board.c
@@ -193,16 +193,6 @@ const uint16_t i2c_port_to_ctrl[I2C_PORT_COUNT] = {
 };
 
 /*
- * Used by chip level I2C controller initialization.
- * Board level can specify two unused I2C addresses
- * for each controller. Current chip level disables
- * controller response to address 0(general call).
- */
-const uint32_t i2c_ctrl_slave_addrs[I2C_CONTROLLER_COUNT] = {
-	0, 0, 0, 0
-};
-
-/*
  * default to I2C0 because callers may not check
  * return value if we returned an error code.
  */
@@ -217,26 +207,6 @@ int board_i2c_p2c(int port)
 	return -1;
 }
 
-/* Return the two slave addresses the specified
- * controller will respond to when controller
- * is acting as a slave.
- * b[6:0]  = b[7:1] of I2C address 1
- * b[14:8] = b[7:1] of I2C address 2
- * When not using I2C controllers as slaves we can use
- * the same value for all controllers. The address should
- * not be 0x00 as this is the general call address.
- */
-uint16_t board_i2c_slave_addrs(int controller)
-{
-	int i;
-
-	for (i = 0; i < I2C_CONTROLLER_COUNT; i++)
-		if ((i2c_ctrl_slave_addrs[i] & 0xffff) == controller)
-			return (i2c_ctrl_slave_addrs[i] >> 16);
-
-	return CONFIG_MCHP_I2C0_SLAVE_ADDRS;
-}
-
 static void sklrvp_init(void)
 {
 	int extpwr = extpower_is_present();
diff --git a/board/sklrvp_mchp/board.h b/board/sklrvp_mchp/board.h
index faa3b39c66..3ed16a96ee 100644
--- a/board/sklrvp_mchp/board.h
+++ b/board/sklrvp_mchp/board.h
@@ -105,7 +105,7 @@
 #define CONFIG_BOARD_EC_HANDLES_ALL_SYS_PWRGD
 
 /*
- * Maximum clock frequence eSPI EC slave advertises
+ * Maximum clock frequence eSPI EC advertises
  * Values in MHz are 20, 25, 33, 50, and 66
  */
 /* SKL/KBL + EVB fly-wire hook up only supports 20MHz */
@@ -113,7 +113,7 @@
 
 
 /*
- * EC eSPI slave advertises IO lanes
+ * EC eSPI advertises IO lanes
  * 0 = Single
  * 1 = Single and Dual
  * 2 = Single and Quad
@@ -282,14 +282,6 @@ enum battery_type {
 /* Map I2C port to controller */
 int board_i2c_p2c(int port);
 
-/* Return the two slave addresses the specified
- * controller will respond to when controller
- * is acting as a slave.
- * b[6:0]  = b[7:1] of I2C address 1
- * b[14:8] = b[7:1] of I2C address 2
- */
-uint16_t board_i2c_slave_addrs(int controller);
-
 /* Reset PD MCU */
 void board_reset_pd_mcu(void);