COIL: Rename CONFIG_I2C_CONTROLLER

Rename CONFIG_I2C_CONTROLLER and related comments.

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

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

12 files changed, 12 insertions, 12 deletions

diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h
index 96e46ad319..adedd00a42 100644
--- a/baseboard/dedede/baseboard.h
+++ b/baseboard/dedede/baseboard.h
@@ -101,7 +101,7 @@
 #define CONFIG_HOSTCMD_ESPI
 #define CONFIG_HOSTCMD_EVENTS
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define CONFIG_I2C_BUS_MAY_BE_UNPOWERED
 #define CONFIG_LOW_POWER_IDLE
 #define CONFIG_POWER_PP5000_CONTROL
diff --git a/baseboard/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h
index 5b095ce08f..ac5fa720bf 100644
--- a/baseboard/dragonegg/baseboard.h
+++ b/baseboard/dragonegg/baseboard.h
@@ -131,7 +131,7 @@
 #define CONFIG_IT83XX_VCC_1P8V
 /* I2C Bus Configuration */
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define I2C_PORT_BATTERY	IT83XX_I2C_CH_F	/* Shared bus */
 #define I2C_PORT_CHARGER	IT83XX_I2C_CH_F	/* Shared bus */
 #define I2C_PORT_SENSOR		IT83XX_I2C_CH_B
diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h
index 589c2454ed..c5d3a5dde5 100644
--- a/baseboard/grunt/baseboard.h
+++ b/baseboard/grunt/baseboard.h
@@ -41,7 +41,7 @@
 #define CONFIG_HOSTCMD_SKUID
 #define CONFIG_I2C
 #define CONFIG_I2C_BUS_MAY_BE_UNPOWERED
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define CONFIG_LOW_POWER_IDLE
 #define CONFIG_LOW_POWER_S0
 #define CONFIG_LTO
diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h
index 00ce1e0dac..0655fdeab5 100644
--- a/baseboard/hatch/baseboard.h
+++ b/baseboard/hatch/baseboard.h
@@ -179,7 +179,7 @@
 
 /* I2C Bus Configuration */
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define I2C_PORT_SENSOR		NPCX_I2C_PORT0_0
 #define I2C_PORT_PPC0		NPCX_I2C_PORT1_0
 #define I2C_PORT_TCPC1		NPCX_I2C_PORT2_0
diff --git a/baseboard/honeybuns/baseboard.h b/baseboard/honeybuns/baseboard.h
index 0703ea0b33..4e2af658c5 100644
--- a/baseboard/honeybuns/baseboard.h
+++ b/baseboard/honeybuns/baseboard.h
@@ -47,7 +47,7 @@
 
 /* I2C Bus Configuration */
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define I2C_PORT_USBC		0
 #define I2C_PORT_MST		1
 #define I2C_PORT_EEPROM	2
diff --git a/baseboard/intelrvp/baseboard.h b/baseboard/intelrvp/baseboard.h
index 280fb8c1ea..4b1d96c755 100644
--- a/baseboard/intelrvp/baseboard.h
+++ b/baseboard/intelrvp/baseboard.h
@@ -155,7 +155,7 @@
 
 /* I2C ports */
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 
 /* EC exclude modules */
 
diff --git a/baseboard/ite_evb/baseboard.h b/baseboard/ite_evb/baseboard.h
index 6f4f4810a3..1d28a15312 100644
--- a/baseboard/ite_evb/baseboard.h
+++ b/baseboard/ite_evb/baseboard.h
@@ -13,7 +13,7 @@
 #define CONFIG_BOARD_VERSION_GPIO
 #define CONFIG_FANS 1
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define CONFIG_IT83XX_ENABLE_MOUSE_DEVICE
 #define CONFIG_IT83XX_SMCLK2_ON_GPC7
 #define CONFIG_IT83XX_VCC_3P3V
diff --git a/baseboard/kalista/baseboard.h b/baseboard/kalista/baseboard.h
index ede6388b39..708a8ba990 100644
--- a/baseboard/kalista/baseboard.h
+++ b/baseboard/kalista/baseboard.h
@@ -31,7 +31,7 @@
 #define CONFIG_FLASH_SIZE 0x80000
 #define CONFIG_FPU
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #undef  CONFIG_LID_SWITCH
 #define CONFIG_POWER_BUTTON_IGNORE_LID
 #define CONFIG_PWM
diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h
index d4019f1fb1..f3c0678386 100644
--- a/baseboard/kukui/baseboard.h
+++ b/baseboard/kukui/baseboard.h
@@ -127,7 +127,7 @@
 #define CONFIG_EMULATED_SYSRQ
 #undef  CONFIG_HIBERNATE
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define CONFIG_I2C_VIRTUAL_BATTERY
 #define CONFIG_I2C_PASSTHRU_RESTRICTED
 #define CONFIG_LED_COMMON
diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h
index c67c963c4f..264e62c38e 100644
--- a/baseboard/octopus/baseboard.h
+++ b/baseboard/octopus/baseboard.h
@@ -79,7 +79,7 @@
 
 /* Common EC defines */
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define CONFIG_I2C_BUS_MAY_BE_UNPOWERED
 #define CONFIG_VBOOT_HASH
 #define CONFIG_VSTORE
diff --git a/baseboard/trogdor/baseboard.h b/baseboard/trogdor/baseboard.h
index e2f7be6615..2b0bf5b2af 100644
--- a/baseboard/trogdor/baseboard.h
+++ b/baseboard/trogdor/baseboard.h
@@ -26,7 +26,7 @@
 
 /* EC Modules */
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define CONFIG_I2C_VIRTUAL_BATTERY
 #define CONFIG_I2C_PASSTHRU_RESTRICTED
 #define CONFIG_LED_COMMON
diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h
index b853efafbf..45b565b736 100644
--- a/baseboard/zork/baseboard.h
+++ b/baseboard/zork/baseboard.h
@@ -40,7 +40,7 @@
 #define CONFIG_HIBERNATE_PSL
 #define CONFIG_HOSTCMD_ESPI
 #define CONFIG_I2C
-#define CONFIG_I2C_MASTER
+#define CONFIG_I2C_CONTROLLER
 #define CONFIG_I2C_UPDATE_IF_CHANGED
 #define CONFIG_LOW_POWER_IDLE
 #define CONFIG_LTO