diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-11-03 14:52:49 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-05 01:28:37 +0000 |
| commit | 899412aaf662619fbf66bbdc0398c7d69aebc482 (patch) | |
| tree | c8f0a938571a25a60cdadec0789db6b5842cc28f /common | |
| parent | 1044b2dfac75e861f00e03bcfe3231506ca2ae93 (diff) | |
| download | chrome-ec-899412aaf662619fbf66bbdc0398c7d69aebc482.tar.gz | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/build.mk | 2 | ||||
| -rw-r--r-- | common/ec_features.c | 2 | ||||
| -rw-r--r-- | common/main.c | 2 | ||||
| -rw-r--r-- | common/system.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/common/build.mk b/common/build.mk index e0350eefb3..ffed2f8a4f 100644 --- a/common/build.mk +++ b/common/build.mk @@ -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 diff --git a/common/ec_features.c b/common/ec_features.c index b6d20c5806..211462173f 100644 --- a/common/ec_features.c +++ b/common/ec_features.c @@ -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 diff --git a/common/main.c b/common/main.c index e749c3e21f..c1228d0a7a 100644 --- a/common/main.c +++ b/common/main.c @@ -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. diff --git a/common/system.c b/common/system.c index 6e79a6686c..2f11945d71 100644 --- a/common/system.c +++ b/common/system.c @@ -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 |