From 899412aaf662619fbf66bbdc0398c7d69aebc482 Mon Sep 17 00:00:00 2001 From: Diana Z Date: Tue, 3 Nov 2020 14:52:49 -0700 Subject: 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 Change-Id: Ied6a1829bf54a5c9a32e6772982a4b8aa31aaf23 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2518659 Reviewed-by: Daisuke Nojiri --- board/ambassador/board.h | 2 +- board/arcada_ish/board.h | 2 +- board/asurada/board.h | 2 +- board/atlas/board.h | 2 +- board/atlas_ish/board.h | 2 +- board/bds/board.h | 2 +- board/boldar/board.h | 2 +- board/c2d2/board.h | 2 +- board/cheza/board.h | 2 +- board/coffeecake/board.h | 2 +- board/coral/board.h | 2 +- board/delbin/board.h | 2 +- board/dooly/board.h | 2 +- board/drallion_ish/board.h | 2 +- board/drobit/board.h | 2 +- board/eldrid/board.h | 2 +- board/elemi/board.h | 2 +- board/elm/board.h | 2 +- board/endeavour/board.h | 2 +- board/eve/board.h | 2 +- board/fizz/board.h | 2 +- board/flapjack/board.h | 2 +- board/fluffy/board.h | 2 +- board/fusb307bgevb/board.h | 2 +- board/glkrvp/board.h | 2 +- board/glkrvp_ite/board.h | 2 +- board/halvor/board.h | 2 +- board/hammer/board.h | 2 +- board/host/board.h | 2 +- board/jerry/board.h | 2 +- board/lindar/board.h | 2 +- board/lingcod/board.h | 2 +- board/malefor/board.h | 2 +- board/max32660-eval/board.h | 2 +- board/mchpevb1/board.h | 2 +- board/nami/board.h | 2 +- board/nautilus/board.h | 2 +- board/nocturne/board.h | 2 +- board/npcx7_evb/board.h | 2 +- board/npcx9_evb/board.h | 2 +- board/npcx_evb/board.h | 2 +- board/npcx_evb_arm/board.h | 2 +- board/nucleo-f072rb/board.h | 2 +- board/nucleo-f411re/board.h | 2 +- board/oak/board.h | 2 +- board/pdeval-stm32f072/board.h | 2 +- board/plankton/board.h | 2 +- board/poppy/board.h | 2 +- board/puff/board.h | 2 +- board/rainier/board.h | 2 +- board/rammus/board.h | 2 +- board/reef/board.h | 2 +- board/reef_it8320/board.h | 2 +- board/reef_mchp/board.h | 2 +- board/samus/board.h | 2 +- board/samus_pd/board.h | 2 +- board/scarlet/board.h | 2 +- board/servo_micro/board.h | 2 +- board/servo_v4/board.h | 2 +- board/servo_v4p1/board.h | 2 +- board/stm32f446e-eval/board.h | 2 +- board/sweetberry/board.h | 2 +- board/terrador/board.h | 2 +- board/tglrvp_ish/board.h | 2 +- board/tigertail/board.h | 2 +- board/todor/board.h | 2 +- board/trondo/board.h | 2 +- board/twinkie/board.h | 2 +- board/voema/board.h | 2 +- board/volteer/board.h | 2 +- board/volteer_ish/board.h | 2 +- board/voxel/board.h | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) (limited to 'board') diff --git a/board/ambassador/board.h b/board/ambassador/board.h index 226723027b..26718e50ff 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -170,7 +170,7 @@ /* I2C Bus Configuration */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_INA NPCX_I2C_PORT0_0 #define I2C_PORT_PPC0 NPCX_I2C_PORT1_0 #define I2C_PORT_TCPC0 NPCX_I2C_PORT3_0 diff --git a/board/arcada_ish/board.h b/board/arcada_ish/board.h index ca69c1ba15..3d4d9a044f 100644 --- a/board/arcada_ish/board.h +++ b/board/arcada_ish/board.h @@ -22,7 +22,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_ACCEL_LNG2DM /* Base sensor: LNG2DM * (uses LIS2DH driver) diff --git a/board/asurada/board.h b/board/asurada/board.h index e2bc2052b9..03c1fc1dd0 100644 --- a/board/asurada/board.h +++ b/board/asurada/board.h @@ -78,7 +78,7 @@ /* I2C */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_I2C_PASSTHRU_RESTRICTED #define CONFIG_I2C_VIRTUAL_BATTERY #define I2C_PORT_CHARGER IT83XX_I2C_CH_A diff --git a/board/atlas/board.h b/board/atlas/board.h index 8910d39198..8107f16b6b 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -23,7 +23,7 @@ #define CONFIG_DPTF #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE #define CONFIG_LTO diff --git a/board/atlas_ish/board.h b/board/atlas_ish/board.h index 4e590f033e..fe5cdedc9d 100644 --- a/board/atlas_ish/board.h +++ b/board/atlas_ish/board.h @@ -28,7 +28,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER /* HID subsystem */ #define CONFIG_HID_HECI diff --git a/board/bds/board.h b/board/bds/board.h index f43ea6ee92..c859089f04 100644 --- a/board/bds/board.h +++ b/board/bds/board.h @@ -11,7 +11,7 @@ /* Optional features */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER /* LM4 modules we don't use on link but still want to keep compiling */ #define CONFIG_EEPROM diff --git a/board/boldar/board.h b/board/boldar/board.h index 67476d8a2e..fce10a1284 100644 --- a/board/boldar/board.h +++ b/board/boldar/board.h @@ -160,7 +160,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/c2d2/board.h b/board/c2d2/board.h index 2aa129ef25..770851332c 100644 --- a/board/c2d2/board.h +++ b/board/c2d2/board.h @@ -78,7 +78,7 @@ /* Enable control of I2C over USB */ #define CONFIG_USB_I2C #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_EC 0 #define I2C_PORT_AUX 1 diff --git a/board/cheza/board.h b/board/cheza/board.h index 23a6b9f81a..e0aa3cd061 100644 --- a/board/cheza/board.h +++ b/board/cheza/board.h @@ -35,7 +35,7 @@ /* EC Modules */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE #define CONFIG_ADC diff --git a/board/coffeecake/board.h b/board/coffeecake/board.h index f69ebe2f29..aca92c52c3 100644 --- a/board/coffeecake/board.h +++ b/board/coffeecake/board.h @@ -24,7 +24,7 @@ #define CONFIG_CHARGER_SY21612 #define CONFIG_HW_CRC #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_RSA #define CONFIG_RWSIG #define CONFIG_RWSIG_TYPE_USBPD1 diff --git a/board/coral/board.h b/board/coral/board.h index 85ddd8e5c2..3f09b7ebdd 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -123,7 +123,7 @@ #undef CONFIG_MPU #define CONFIG_HOSTCMD_FLASH_SPI_INFO #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_COL2_INVERTED diff --git a/board/delbin/board.h b/board/delbin/board.h index 7b94edf039..39736ca384 100644 --- a/board/delbin/board.h +++ b/board/delbin/board.h @@ -148,7 +148,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/dooly/board.h b/board/dooly/board.h index b49c6457cf..90e9d9f968 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -199,7 +199,7 @@ /* I2C Bus Configuration */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_INA NPCX_I2C_PORT0_0 #define I2C_PORT_SENSORS NPCX_I2C_PORT0_0 #define I2C_PORT_PPC0 NPCX_I2C_PORT1_0 diff --git a/board/drallion_ish/board.h b/board/drallion_ish/board.h index fbe4477a39..7bfd6b395a 100644 --- a/board/drallion_ish/board.h +++ b/board/drallion_ish/board.h @@ -22,7 +22,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER /* Base sensor: LNG2DM (uses LIS2DH driver) */ #define CONFIG_ACCEL_LNG2DM diff --git a/board/drobit/board.h b/board/drobit/board.h index 004e2f28f8..d89a0e6d02 100644 --- a/board/drobit/board.h +++ b/board/drobit/board.h @@ -145,7 +145,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/eldrid/board.h b/board/eldrid/board.h index ca5b47749f..f90364a5d0 100644 --- a/board/eldrid/board.h +++ b/board/eldrid/board.h @@ -152,7 +152,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/elemi/board.h b/board/elemi/board.h index 69a1e3cb35..fc8ebdcaab 100644 --- a/board/elemi/board.h +++ b/board/elemi/board.h @@ -148,7 +148,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/elm/board.h b/board/elm/board.h index a248f6b757..91da1be3f7 100644 --- a/board/elm/board.h +++ b/board/elm/board.h @@ -57,7 +57,7 @@ /* Other configs */ #define CONFIG_HOST_COMMAND_STATUS #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_LED_COMMON diff --git a/board/endeavour/board.h b/board/endeavour/board.h index 29ca1316f9..7bf8415cb9 100644 --- a/board/endeavour/board.h +++ b/board/endeavour/board.h @@ -30,7 +30,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/board/eve/board.h b/board/eve/board.h index bffbda9d9a..ab1af7cb5c 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -33,7 +33,7 @@ #define CONFIG_HIBERNATE_BATT_PCT 10 #define CONFIG_HIBERNATE_BATT_SEC (3600 * 24) #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_LED_COMMON #define CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE diff --git a/board/fizz/board.h b/board/fizz/board.h index 209fe29dfe..4aaf9090af 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.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/board/flapjack/board.h b/board/flapjack/board.h index 370bd1727f..e80a9ae222 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -19,7 +19,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/board/fluffy/board.h b/board/fluffy/board.h index 41c01bd8fa..75e9843b83 100644 --- a/board/fluffy/board.h +++ b/board/fluffy/board.h @@ -42,7 +42,7 @@ #define CONFIG_ADC #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/fusb307bgevb/board.h b/board/fusb307bgevb/board.h index 2497dc7c69..d93b34c980 100644 --- a/board/fusb307bgevb/board.h +++ b/board/fusb307bgevb/board.h @@ -31,7 +31,7 @@ #define CONFIG_STM_HWTIMER32 #define CONFIG_HW_CRC #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER /* USB Configuration */ #define CONFIG_USB diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h index 138aa478bf..97253f26cf 100644 --- a/board/glkrvp/board.h +++ b/board/glkrvp/board.h @@ -92,7 +92,7 @@ #define CONFIG_WP_ALWAYS #define CONFIG_FLASH_READOUT_PROTECTION #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_LID_SWITCH #define CONFIG_LTO diff --git a/board/glkrvp_ite/board.h b/board/glkrvp_ite/board.h index 1ae3089508..7ad5966853 100644 --- a/board/glkrvp_ite/board.h +++ b/board/glkrvp_ite/board.h @@ -108,7 +108,7 @@ /* I2C ports */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_IT83XX_SMCLK2_ON_GPC7 #define I2C_PORT_CHARGER IT83XX_I2C_CH_A diff --git a/board/halvor/board.h b/board/halvor/board.h index b1db5627fa..f2f7806dfd 100644 --- a/board/halvor/board.h +++ b/board/halvor/board.h @@ -142,7 +142,7 @@ #define I2C_PORT_USB_1_MIX I2C_PORT_USB_BB_RETIMER #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/hammer/board.h b/board/hammer/board.h index d1a7af0bfe..5903abe1df 100644 --- a/board/hammer/board.h +++ b/board/hammer/board.h @@ -210,7 +210,7 @@ #if defined(HAS_I2C_TOUCHPAD) || defined(CONFIG_LED_DRIVER_LM3630A) #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_MASTER 0 #define I2C_PORT_KBLIGHT 0 #define I2C_PORT_CHARGER 1 diff --git a/board/host/board.h b/board/host/board.h index 0eafedc2bc..30c2bb8e29 100644 --- a/board/host/board.h +++ b/board/host/board.h @@ -90,7 +90,7 @@ void fps_event(enum gpio_signal signal); #define CONFIG_CRC8 #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_EEPROM 0 #define I2C_ADDR_EEPROM_FLAGS 0x50 diff --git a/board/jerry/board.h b/board/jerry/board.h index 2671e20fbb..8c894b8df4 100644 --- a/board/jerry/board.h +++ b/board/jerry/board.h @@ -26,7 +26,7 @@ #define CONFIG_HOST_COMMAND_STATUS #define CONFIG_HOSTCMD_VBNV_CONTEXT #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_I2C_VIRTUAL_BATTERY #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_MKBP diff --git a/board/lindar/board.h b/board/lindar/board.h index bacac9d015..b4f659a5c3 100644 --- a/board/lindar/board.h +++ b/board/lindar/board.h @@ -131,7 +131,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/lingcod/board.h b/board/lingcod/board.h index 230b40fd84..d5e4124f27 100644 --- a/board/lingcod/board.h +++ b/board/lingcod/board.h @@ -130,7 +130,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/malefor/board.h b/board/malefor/board.h index 321fbc130f..08cc50a2d0 100644 --- a/board/malefor/board.h +++ b/board/malefor/board.h @@ -130,7 +130,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/max32660-eval/board.h b/board/max32660-eval/board.h index 21a1776166..c815b7bed2 100644 --- a/board/max32660-eval/board.h +++ b/board/max32660-eval/board.h @@ -11,7 +11,7 @@ /* Optional features */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_FPU diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h index e46a1dced4..af5553be92 100644 --- a/board/mchpevb1/board.h +++ b/board/mchpevb1/board.h @@ -173,7 +173,7 @@ /* #define CONFIG_HOSTCMD_PD */ /* #define CONFIG_HOSTCMD_PD_PANIC */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON diff --git a/board/nami/board.h b/board/nami/board.h index b12d8133bd..5343abf660 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -27,7 +27,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/board/nautilus/board.h b/board/nautilus/board.h index 958e3d202c..f8b64cb4b3 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -26,7 +26,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_I2C_XFER_BOARD_CALLBACK #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/board/nocturne/board.h b/board/nocturne/board.h index a97b242978..5f481167dc 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -37,7 +37,7 @@ #define CONFIG_HOSTCMD_ESPI #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_PWM #define CONFIG_THROTTLE_AP diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h index 6d36f901b0..b93a11fcc5 100644 --- a/board/npcx7_evb/board.h +++ b/board/npcx7_evb/board.h @@ -36,7 +36,7 @@ #define CONFIG_ENABLE_JTAG_SELECTION #define CONFIG_BOARD_VERSION_GPIO #define CONFIG_EXTPOWER_GPIO -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #undef CONFIG_LOW_POWER_IDLE /* Deep Sleep Support */ diff --git a/board/npcx9_evb/board.h b/board/npcx9_evb/board.h index cac7ea99be..f91fd1c28d 100644 --- a/board/npcx9_evb/board.h +++ b/board/npcx9_evb/board.h @@ -22,7 +22,7 @@ #define CONFIG_ENABLE_JTAG_SELECTION #define CONFIG_BOARD_VERSION_GPIO #define CONFIG_EXTPOWER_GPIO -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #undef CONFIG_LOW_POWER_IDLE /* Deep Sleep Support */ diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h index d7b7b6162a..db7d2cc39e 100644 --- a/board/npcx_evb/board.h +++ b/board/npcx_evb/board.h @@ -23,7 +23,7 @@ #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_POWER_BUTTON diff --git a/board/npcx_evb_arm/board.h b/board/npcx_evb_arm/board.h index 5128bffd0a..40f001f0a3 100644 --- a/board/npcx_evb_arm/board.h +++ b/board/npcx_evb_arm/board.h @@ -19,7 +19,7 @@ #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_MKBP /* Instead of 8042 protocol of keyboard */ #define CONFIG_MKBP_USE_GPIO diff --git a/board/nucleo-f072rb/board.h b/board/nucleo-f072rb/board.h index 9cc2fc2d0b..0ec675ab61 100644 --- a/board/nucleo-f072rb/board.h +++ b/board/nucleo-f072rb/board.h @@ -23,7 +23,7 @@ #define STM32_IRQ_EXT2_3_PRIORITY 2 #ifdef CTS_MODULE_I2C #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #endif #endif diff --git a/board/nucleo-f411re/board.h b/board/nucleo-f411re/board.h index 069e1367f2..56d2ad41d0 100644 --- a/board/nucleo-f411re/board.h +++ b/board/nucleo-f411re/board.h @@ -40,7 +40,7 @@ #define CONFIG_CMD_FLASH /* I2C ports configuration */ -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_I2C_DEBUG #define I2C_PORT_MASTER 1 #define I2C_PORT_SLAVE 0 /* needed for DMAC macros (ugh) */ diff --git a/board/oak/board.h b/board/oak/board.h index d959763853..56d3e1ad8e 100644 --- a/board/oak/board.h +++ b/board/oak/board.h @@ -77,7 +77,7 @@ #define CONFIG_HOSTCMD_PD #define CONFIG_HOSTCMD_PD_PANIC #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_LED_COMMON diff --git a/board/pdeval-stm32f072/board.h b/board/pdeval-stm32f072/board.h index 6da1c7c1f0..19556c8432 100644 --- a/board/pdeval-stm32f072/board.h +++ b/board/pdeval-stm32f072/board.h @@ -18,7 +18,7 @@ /* Optional features */ #define CONFIG_HW_CRC #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_STM_HWTIMER32 /* USB Power Delivery configuration */ #define CONFIG_USB_POWER_DELIVERY diff --git a/board/plankton/board.h b/board/plankton/board.h index 5e2f5f28a0..39ab706cd2 100644 --- a/board/plankton/board.h +++ b/board/plankton/board.h @@ -34,7 +34,7 @@ #define CONFIG_ADC #define CONFIG_HW_CRC #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_INA219 #define CONFIG_IO_EXPANDER_PCA9534 #undef CONFIG_WATCHDOG_HELP diff --git a/board/poppy/board.h b/board/poppy/board.h index 00effffe56..72b3a618a4 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -29,7 +29,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_LED_COMMON #define CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE diff --git a/board/puff/board.h b/board/puff/board.h index 57284761fa..078769622f 100644 --- a/board/puff/board.h +++ b/board/puff/board.h @@ -170,7 +170,7 @@ /* I2C Bus Configuration */ #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_INA NPCX_I2C_PORT0_0 #define I2C_PORT_PPC0 NPCX_I2C_PORT1_0 #define I2C_PORT_TCPC0 NPCX_I2C_PORT3_0 diff --git a/board/rainier/board.h b/board/rainier/board.h index 7ff319e0ea..592c6bca9c 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -16,7 +16,7 @@ #define CONFIG_CMD_RTC #define CONFIG_HOSTCMD_RTC #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_I2C_PASSTHRU_RESTRICTED #define CONFIG_LOW_POWER_IDLE #define CONFIG_POWER_COMMON diff --git a/board/rammus/board.h b/board/rammus/board.h index 7a569392a5..81f76b842d 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -19,7 +19,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_COL2_INVERTED #undef CONFIG_KEYBOARD_VIVALDI #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/board/reef/board.h b/board/reef/board.h index 8b38811024..39015541fe 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -119,7 +119,7 @@ #define CONFIG_FPU #define CONFIG_HOSTCMD_FLASH_SPI_INFO #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_COL2_INVERTED diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h index da2c9a5c4f..52ade2bbf7 100644 --- a/board/reef_it8320/board.h +++ b/board/reef_it8320/board.h @@ -115,7 +115,7 @@ #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000 #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_IT83XX_VCC_3P3V #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h index 0e630e15fb..cef9912be3 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -119,7 +119,7 @@ #define CONFIG_FPU #define CONFIG_HOSTCMD_FLASH_SPI_INFO #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_COL2_INVERTED diff --git a/board/samus/board.h b/board/samus/board.h index 1e3154c2e3..c021275a0e 100644 --- a/board/samus/board.h +++ b/board/samus/board.h @@ -29,7 +29,7 @@ #define CONFIG_POWER_SHUTDOWN_PAUSE_IN_S5 #define CONFIG_CHIPSET_CAN_THROTTLE #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_COL2_INVERTED diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h index 3f3032d3f3..a4039b491c 100644 --- a/board/samus_pd/board.h +++ b/board/samus_pd/board.h @@ -47,7 +47,7 @@ #undef CONFIG_HOSTCMD_EVENTS #define CONFIG_HW_CRC #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_I2C_SLAVE #undef CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE diff --git a/board/scarlet/board.h b/board/scarlet/board.h index 7e48ffde52..9d129a3910 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -18,7 +18,7 @@ #undef CONFIG_HIBERNATE #define CONFIG_HOSTCMD_RTC #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/board/servo_micro/board.h b/board/servo_micro/board.h index 50e6910811..1565a63f9a 100644 --- a/board/servo_micro/board.h +++ b/board/servo_micro/board.h @@ -85,7 +85,7 @@ /* Enable control of I2C over USB */ #define CONFIG_USB_I2C #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_MASTER 0 /* See i2c_ite_flash_support.c for more information about these values */ diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h index 8654ad901e..5fcb14e527 100644 --- a/board/servo_v4/board.h +++ b/board/servo_v4/board.h @@ -99,7 +99,7 @@ /* Enable control of I2C over USB */ #define CONFIG_USB_I2C #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_MASTER 1 /* PD features */ diff --git a/board/servo_v4p1/board.h b/board/servo_v4p1/board.h index da5b670e9f..015f44e97d 100644 --- a/board/servo_v4p1/board.h +++ b/board/servo_v4p1/board.h @@ -163,7 +163,7 @@ /* Enable control of I2C over USB */ #define CONFIG_USB_I2C #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_MASTER 1 /* PD features */ diff --git a/board/stm32f446e-eval/board.h b/board/stm32f446e-eval/board.h index fa0b0177ef..656d372766 100644 --- a/board/stm32f446e-eval/board.h +++ b/board/stm32f446e-eval/board.h @@ -27,7 +27,7 @@ #define CONFIG_UART_RX_REQ_CH 4 #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_0 0 #define FMPI2C_PORT_3 3 diff --git a/board/sweetberry/board.h b/board/sweetberry/board.h index 1edea99b9a..55aab7d1ee 100644 --- a/board/sweetberry/board.h +++ b/board/sweetberry/board.h @@ -64,7 +64,7 @@ #define CONFIG_USB_I2C #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_0 0 #define I2C_PORT_1 1 #define I2C_PORT_2 2 diff --git a/board/terrador/board.h b/board/terrador/board.h index 16c72663de..6c7fa9fde2 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -150,7 +150,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/tglrvp_ish/board.h b/board/tglrvp_ish/board.h index a9a3d4d544..2b7d86a140 100644 --- a/board/tglrvp_ish/board.h +++ b/board/tglrvp_ish/board.h @@ -29,7 +29,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_ACCELGYRO_LSM6DSM /* For LSM6DS3 */ #define CONFIG_ACCEL_FORCE_MODE_MASK BIT(BASE_ACCEL) diff --git a/board/tigertail/board.h b/board/tigertail/board.h index 63019e717f..3b15c4c774 100644 --- a/board/tigertail/board.h +++ b/board/tigertail/board.h @@ -64,7 +64,7 @@ /* Enable control of I2C over USB */ #define CONFIG_USB_I2C #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define I2C_PORT_MASTER 0 #define CONFIG_INA231 diff --git a/board/todor/board.h b/board/todor/board.h index 011fd8e359..528b6ec793 100644 --- a/board/todor/board.h +++ b/board/todor/board.h @@ -149,7 +149,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/trondo/board.h b/board/trondo/board.h index c81bc1a5db..ebe244aff9 100644 --- a/board/trondo/board.h +++ b/board/trondo/board.h @@ -144,7 +144,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/twinkie/board.h b/board/twinkie/board.h index b5756fda34..3d601ee979 100644 --- a/board/twinkie/board.h +++ b/board/twinkie/board.h @@ -42,7 +42,7 @@ #define CONFIG_ADC #define CONFIG_BOARD_PRE_INIT #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #define CONFIG_INA231 #undef CONFIG_WATCHDOG_HELP #undef CONFIG_LID_SWITCH diff --git a/board/voema/board.h b/board/voema/board.h index 15e6938562..337ee53711 100644 --- a/board/voema/board.h +++ b/board/voema/board.h @@ -153,7 +153,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/volteer/board.h b/board/volteer/board.h index 7ab87313f6..5e607db0b1 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -153,7 +153,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ diff --git a/board/volteer_ish/board.h b/board/volteer_ish/board.h index b290d70b19..752ea283d5 100644 --- a/board/volteer_ish/board.h +++ b/board/volteer_ish/board.h @@ -29,7 +29,7 @@ #define CONFIG_FLASH_SIZE 0x80000 #define CONFIG_FPU #define CONFIG_I2C -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER /* BMA253 Lid accel */ #define CONFIG_ACCEL_BMA255 diff --git a/board/voxel/board.h b/board/voxel/board.h index 3ced8f5510..af975e263b 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -153,7 +153,7 @@ #define I2C_PORT_CHARGER I2C_PORT_EEPROM #define I2C_ADDR_EEPROM_FLAGS 0x50 -#define CONFIG_I2C_MASTER +#define CONFIG_I2C_CONTROLLER #ifndef __ASSEMBLER__ -- cgit v1.2.1