diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-11-03 14:58:57 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-05 01:28:40 +0000 |
| commit | e609f07eef8b851b19bf4b59b5263ac702d8b871 (patch) | |
| tree | 2211fbef28040cfbc9ce9831b310524c1e06ec72 /chip | |
| parent | 899412aaf662619fbf66bbdc0398c7d69aebc482 (diff) | |
| download | chrome-ec-e609f07eef8b851b19bf4b59b5263ac702d8b871.tar.gz | |
COIL: Rename CONFIG_I2C_PERIPHERAL
Rename CONFIG_I2C_PERIPHERAL and related comments.
BRANCH=None
BUG=None
TEST=make -j buildall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: I3f148e976f3a4d6a1dc6c58686368c056290d5d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2518660
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/it83xx/build.mk | 2 | ||||
| -rw-r--r-- | chip/it83xx/intc.c | 10 | ||||
| -rw-r--r-- | chip/it83xx/intc.h | 2 | ||||
| -rw-r--r-- | chip/stm32/host_command_common.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/chip/it83xx/build.mk b/chip/it83xx/build.mk index f52fc6b8fe..4feab7735c 100644 --- a/chip/it83xx/build.mk +++ b/chip/it83xx/build.mk @@ -37,4 +37,4 @@ ifndef CONFIG_KEYBOARD_NOT_RAW chip-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o endif chip-$(CONFIG_I2C_CONTROLLER)+=i2c.o -chip-$(CONFIG_I2C_SLAVE)+=i2c_slave.o +chip-$(CONFIG_I2C_PERIPHERAL)+=i2c_slave.o diff --git a/chip/it83xx/intc.c b/chip/it83xx/intc.c index ee9d9be5d1..8f96da17d0 100644 --- a/chip/it83xx/intc.c +++ b/chip/it83xx/intc.c @@ -224,9 +224,9 @@ void intc_cpu_int_group_6(void) int intc_group_6 = intc_get_ec_int(); switch (intc_group_6) { -#if defined(CONFIG_I2C_CONTROLLER) || defined(CONFIG_I2C_SLAVE) +#if defined(CONFIG_I2C_CONTROLLER) || defined(CONFIG_I2C_PERIPHERAL) case IT83XX_IRQ_SMB_A: -#ifdef CONFIG_I2C_SLAVE +#ifdef CONFIG_I2C_PERIPHERAL if (IT83XX_SMB_SFFCTL & IT83XX_SMB_SAFE) i2c_slv_interrupt(IT83XX_I2C_CH_A); else @@ -243,7 +243,7 @@ void intc_cpu_int_group_6(void) break; case IT83XX_IRQ_SMB_D: -#ifdef CONFIG_I2C_SLAVE +#ifdef CONFIG_I2C_PERIPHERAL if (!(IT83XX_I2C_CTR(3) & IT83XX_I2C_MODE)) i2c_slv_interrupt(IT83XX_I2C_CH_D); else @@ -252,7 +252,7 @@ void intc_cpu_int_group_6(void) break; case IT83XX_IRQ_SMB_E: -#ifdef CONFIG_I2C_SLAVE +#ifdef CONFIG_I2C_PERIPHERAL if (!(IT83XX_I2C_CTR(0) & IT83XX_I2C_MODE)) i2c_slv_interrupt(IT83XX_I2C_CH_E); else @@ -261,7 +261,7 @@ void intc_cpu_int_group_6(void) break; case IT83XX_IRQ_SMB_F: -#ifdef CONFIG_I2C_SLAVE +#ifdef CONFIG_I2C_PERIPHERAL if (!(IT83XX_I2C_CTR(1) & IT83XX_I2C_MODE)) i2c_slv_interrupt(IT83XX_I2C_CH_F); else diff --git a/chip/it83xx/intc.h b/chip/it83xx/intc.h index bd6d947453..97639c9a0e 100644 --- a/chip/it83xx/intc.h +++ b/chip/it83xx/intc.h @@ -31,7 +31,7 @@ void adc_interrupt(void); void voltage_comparator_interrupt(void); #endif void i2c_interrupt(int port); -#ifdef CONFIG_I2C_SLAVE +#ifdef CONFIG_I2C_PERIPHERAL void i2c_slv_interrupt(int port); #endif void clock_sleep_mode_wakeup_isr(void); diff --git a/chip/stm32/host_command_common.c b/chip/stm32/host_command_common.c index bb1c6b1830..b39a298c64 100644 --- a/chip/stm32/host_command_common.c +++ b/chip/stm32/host_command_common.c @@ -9,7 +9,7 @@ #include "spi.h" #include "usart_host_command.h" -#ifndef CONFIG_I2C_SLAVE +#ifndef CONFIG_I2C_PERIPHERAL /* Store current transport type */ static enum fp_transport_type curr_transport_type = FP_TRANSPORT_TYPE_UNKNOWN; @@ -43,4 +43,4 @@ DECLARE_HOST_COMMAND(EC_CMD_GET_PROTOCOL_INFO, host_command_protocol_info, EC_VER_MASK(0)); -#endif /* CONFIG_I2C_SLAVE */ +#endif /* CONFIG_I2C_PERIPHERAL */ |