coreboot-mirror
/
chrome-ec
mirror of https://review.coreboot.org/chrome-ec.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Diana Z 2020-11-03 14:52:49 -07:00 committed by Commit Bot
parent 1044b2dfac
commit 899412aaf6
98 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baseboard/dedede/baseboard.h
View File

@ -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

2
baseboard/dragonegg/baseboard.h
View File

@ -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

2
baseboard/grunt/baseboard.h
View File

@ -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

2
baseboard/hatch/baseboard.h
View File

@ -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

2
baseboard/honeybuns/baseboard.h
View File

@ -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

2
baseboard/intelrvp/baseboard.h
View File

@ -155,7 +155,7 @@
/* I2C ports */
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
/* EC exclude modules */

2
baseboard/ite_evb/baseboard.h
View File

@ -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

2
baseboard/kalista/baseboard.h
View File

@ -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

2
baseboard/kukui/baseboard.h
View File

@ -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

2
baseboard/octopus/baseboard.h
View File

@ -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

2
baseboard/trogdor/baseboard.h
View File

@ -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

2
baseboard/zork/baseboard.h
View File

@ -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

2
board/ambassador/board.h
View File

@ -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

2
board/arcada_ish/board.h
View File

@ -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)

2
board/asurada/board.h
View File

@ -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

2
board/atlas/board.h
View File

@ -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

2
board/atlas_ish/board.h
View File

@ -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

2
board/bds/board.h
View File

@ -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

2
board/boldar/board.h
View File

@ -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__

2
board/c2d2/board.h
View File

@ -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

2
board/cheza/board.h
View File

@ -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

2
board/coffeecake/board.h
View File

@ -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

2
board/coral/board.h
View File

@ -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

2
board/delbin/board.h
View File

@ -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__

2
board/dooly/board.h
View File

@ -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

2
board/drallion_ish/board.h
View File

@ -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

2
board/drobit/board.h
View File

@ -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__

2
board/eldrid/board.h
View File

@ -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__

2
board/elemi/board.h
View File

@ -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__

2
board/elm/board.h
View File

@ -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

2
board/endeavour/board.h
View File

@ -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

2
board/eve/board.h
View File

@ -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

2
board/fizz/board.h
View File

@ -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

2
board/flapjack/board.h
View File

@ -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

2
board/fluffy/board.h
View File

@ -42,7 +42,7 @@
#define CONFIG_ADC
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
#ifndef __ASSEMBLER__

2
board/fusb307bgevb/board.h
View File

@ -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

2
board/glkrvp/board.h
View File

@ -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

2
board/glkrvp_ite/board.h
View File

@ -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

2
board/halvor/board.h
View File

@ -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__

2
board/hammer/board.h
View File

@ -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

2
board/host/board.h
View File

@ -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

2
board/jerry/board.h
View File

@ -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

2
board/lindar/board.h
View File

@ -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__

2
board/lingcod/board.h
View File

@ -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__

2
board/malefor/board.h
View File

@ -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__

2
board/max32660-eval/board.h
View File

@ -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

2
board/mchpevb1/board.h
View File

@ -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

2
board/nami/board.h
View File

@ -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

2
board/nautilus/board.h
View File

@ -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

2
board/nocturne/board.h
View File

@ -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

2
board/npcx7_evb/board.h
View File

@ -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 */

2
board/npcx9_evb/board.h
View File

@ -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 */

2
board/npcx_evb/board.h
View File

@ -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

2
board/npcx_evb_arm/board.h
View File

@ -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

2
board/nucleo-f072rb/board.h
View File

@ -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

2
board/nucleo-f411re/board.h
View File

@ -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) */

2
board/oak/board.h
View File

@ -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

2
board/pdeval-stm32f072/board.h
View File

@ -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

2
board/plankton/board.h
View File

@ -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

2
board/poppy/board.h
View File

@ -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

2
board/puff/board.h
View File

@ -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

2
board/rainier/board.h
View File

@ -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

2
board/rammus/board.h
View File

@ -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

2
board/reef/board.h
View File

@ -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

2
board/reef_it8320/board.h
View File

@ -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

2
board/reef_mchp/board.h
View File

@ -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

2
board/samus/board.h
View File

@ -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

2
board/samus_pd/board.h
View File

@ -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

2
board/scarlet/board.h
View File

@ -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

2
board/servo_micro/board.h
View File

@ -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 */

2
board/servo_v4/board.h
View File

@ -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 */

2
board/servo_v4p1/board.h
View File

@ -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 */

2
board/stm32f446e-eval/board.h
View File

@ -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

2
board/sweetberry/board.h
View File

@ -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

2
board/terrador/board.h
View File

@ -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__

2
board/tglrvp_ish/board.h
View File

@ -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)

2
board/tigertail/board.h
View File

@ -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

2
board/todor/board.h
View File

@ -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__

2
board/trondo/board.h
View File

@ -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__

2
board/twinkie/board.h
View File

@ -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

2
board/voema/board.h
View File

@ -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__

2
board/volteer/board.h
View File

@ -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__

2
board/volteer_ish/board.h
View File

@ -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

2
board/voxel/board.h
View File

@ -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__

2
chip/it83xx/build.mk
View File

@ -36,5 +36,5 @@ chip-$(CONFIG_PECI)+=peci.o
ifndef CONFIG_KEYBOARD_NOT_RAW
chip-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o
endif
chip-$(CONFIG_I2C_MASTER)+=i2c.o
chip-$(CONFIG_I2C_CONTROLLER)+=i2c.o
chip-$(CONFIG_I2C_SLAVE)+=i2c_slave.o

2
chip/it83xx/intc.c
View File

@ -224,7 +224,7 @@ void intc_cpu_int_group_6(void)
int intc_group_6 = intc_get_ec_int();
switch (intc_group_6) {
#if defined(CONFIG_I2C_MASTER) || defined(CONFIG_I2C_SLAVE)
#if defined(CONFIG_I2C_CONTROLLER) || defined(CONFIG_I2C_SLAVE)
case IT83XX_IRQ_SMB_A:
#ifdef CONFIG_I2C_SLAVE
if (IT83XX_SMB_SFFCTL & IT83XX_SMB_SAFE)

2
chip/stm32/i2c-stm32f4.c
View File

@ -715,7 +715,7 @@ int i2c_get_line_levels(int port)
/*****************************************************************************/
/* Hooks */
#ifdef CONFIG_I2C_MASTER
#ifdef CONFIG_I2C_CONTROLLER
/* Handle CPU clock changing frequency */
static void i2c_freq_change(void)
{

2
chip/stm32/i2c-stm32g4.c
View File

@ -408,7 +408,7 @@ int i2c_get_line_levels(int port)
/*****************************************************************************/
/* Hooks */
#ifdef CONFIG_I2C_MASTER
#ifdef CONFIG_I2C_CONTROLLER
/* Handle an upcoming frequency change. */
static void i2c_pre_freq_change_hook(void)
{

2
common/build.mk
View File

@ -85,7 +85,7 @@ common-$(CONFIG_HOSTCMD_REGULATOR)+=regulator.o
common-$(CONFIG_HOSTCMD_RTC)+=rtc.o
common-$(CONFIG_I2C_DEBUG)+=i2c_trace.o
common-$(CONFIG_I2C_HID_TOUCHPAD)+=i2c_hid_touchpad.o
common-$(CONFIG_I2C_MASTER)+=i2c_master.o
common-$(CONFIG_I2C_CONTROLLER)+=i2c_master.o
common-$(CONFIG_I2C_SLAVE)+=i2c_slave.o
common-$(CONFIG_I2C_BITBANG)+=i2c_bitbang.o
common-$(CONFIG_I2C_VIRTUAL_BATTERY)+=virtual_battery.o

2
common/ec_features.c
View File

@ -59,7 +59,7 @@ uint32_t get_feature_flags0(void)
#ifdef CONFIG_COMMON_GPIO
| EC_FEATURE_MASK_0(EC_FEATURE_GPIO)
#endif
#ifdef CONFIG_I2C_MASTER
#ifdef CONFIG_I2C_CONTROLLER
| EC_FEATURE_MASK_0(EC_FEATURE_I2C)
#endif
#ifdef CONFIG_CHARGER

2
common/main.c
View File

@ -187,7 +187,7 @@ test_mockable __keep int main(void)
#ifdef CONFIG_HOSTCMD_X86
lpc_init_mask();
#endif
if (IS_ENABLED(CONFIG_I2C_MASTER)) {
if (IS_ENABLED(CONFIG_I2C_CONTROLLER)) {
/*
* Some devices (like the I2C keyboards, CBI) need I2C access
* pretty early, so let's initialize the controller now.

2
common/system.c
View File

@ -530,7 +530,7 @@ static void jump_to_image(uintptr_t init_addr)
/* Note: must be before i2c module is locked down */
pd_prepare_sysjump();
#ifdef CONFIG_I2C_MASTER
#ifdef CONFIG_I2C_CONTROLLER
/* Prepare I2C module for sysjump */
i2c_prepare_sysjump();
#endif

2
cts/build.mk
View File

@ -13,7 +13,7 @@ ifeq "$(CTS_MODULE)" "i2c"
CFLAGS_CTS+=-DCTS_MODULE_I2C=$(EMPTY)
CONFIG_I2C=y
ifneq ($(BOARD),stm32l476g-eval)
CONFIG_I2C_MASTER=y
CONFIG_I2C_CONTROLLER=y
endif
endif

2
docs/configuration/i2c.md
View File

@ -6,7 +6,7 @@ The I2C options are prefixed with `CONFIG_I2C*`. Evaluate whether each option is
appropriate to add to your board.
A typical EC and board should at a minimum set `CONFIG_I2C` and
`CONFIG_I2C_MASTER`.
`CONFIG_I2C_CONTROLLER`.
## Feature Parameters

4
include/config.h
View File

@ -2321,11 +2321,11 @@
#undef CONFIG_I2C_XFER_BOARD_CALLBACK
/*
* EC uses an I2C master interface.
* EC uses an I2C controller interface.
* Note: if this is defined, i2c_init() will be called
* automatically at board boot.
*/
#undef CONFIG_I2C_MASTER
#undef CONFIG_I2C_CONTROLLER
/* EC uses an I2C slave interface */
#undef CONFIG_I2C_SLAVE

2
include/i2c.h
View File

@ -495,7 +495,7 @@ int i2c_set_response(int port, uint8_t *buf, int len);
/*
* Initialize i2c master controller. Automatically called at board boot
* if CONFIG_I2C_MASTER is defined.
* if CONFIG_I2C_CONTROLLER is defined.
*/
void i2c_init(void);

4
test/stress.c
View File

@ -75,7 +75,7 @@ static int stress(const char *name,
/*****************************************************************************/
/* Tests */
#ifdef CONFIG_I2C_MASTER
#ifdef CONFIG_I2C_CONTROLLER
static int test_i2c(void)
{
int res = EC_ERROR_UNKNOWN;
@ -132,7 +132,7 @@ void run_test(int argc, char **argv)
{
test_reset();
#ifdef CONFIG_I2C_MASTER
#ifdef CONFIG_I2C_CONTROLLER
RUN_STRESS_TEST("I2C Stress Test", test_i2c, I2C_TEST_ITERATION);
#endif
#ifdef CONFIG_ADC

14
test/test_config.h
View File

@ -262,7 +262,7 @@ enum sensor_id {
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHARGER_DISCHARGE_ON_AC_CUSTOM
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
int board_discharge_on_ac(int enabled);
#define I2C_PORT_MASTER 0
#define I2C_PORT_BATTERY 0
@ -273,7 +273,7 @@ int board_discharge_on_ac(int enabled);
#define CONFIG_CHIPSET_CAN_THROTTLE
#define CONFIG_FANS 1
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
#define CONFIG_TEMP_SENSOR
#define CONFIG_THROTTLE_AP
#define CONFIG_THERMISTOR
@ -298,7 +298,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
#define CONFIG_BATTERY_SMART
#define CONFIG_CHARGER_INPUT_CURRENT 4032
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
#define I2C_PORT_MASTER 0
#define I2C_PORT_BATTERY 0
#define I2C_PORT_CHARGER 0
@ -310,7 +310,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
#ifdef TEST_LIGHTBAR
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
#define I2C_PORT_LIGHTBAR 0
#define CONFIG_ALS_LIGHTBAR_DIMMING 0
#endif
@ -484,7 +484,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
#define PD_VCONN_SWAP_DELAY 5000 /* us */
#define CONFIG_USB_PD_TCPM_TCPCI
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
#define I2C_PORT_HOST_TCPC 0
#define CONFIG_USB_PD_DEBUG_LEVEL 3
#define CONFIG_USB_PD_EXTENDED_MESSAGES
@ -538,7 +538,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
#define CONFIG_BATTERY
#define CONFIG_BATTERY_SMART
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
#define I2C_PORT_BATTERY 0
#endif /* TEST_CHARGE_MANAGER_* */
@ -583,7 +583,7 @@ int ncp15wb_calculate_temp(uint16_t adc);
#ifdef TEST_I2C_BITBANG
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_CONTROLLER
#define CONFIG_I2C_BITBANG
#define I2C_BITBANG_PORT_COUNT 1
#endif