diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-10-30 15:08:03 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-31 01:06:10 +0000 |
| commit | c52033d763d7b63978e3207a33725a2c9ff2aff3 (patch) | |
| tree | fb9646377b325ed5d627b7ff2433334211911463 | |
| parent | 63e4dcbe22f2b987e3040a1a8a39720fb4cd55bf (diff) | |
| download | chrome-ec-c52033d763d7b63978e3207a33725a2c9ff2aff3.tar.gz | |
COIL: Rename SLEEP_MASK_I2C_PERIPHERAL
Rename SLEEP_MASK_I2C_PERIPHERAL and related comments.
BRANCH=None
BUG=None
TEST=make -j buildall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: Idaeefda102c603a38f128d820ed1f647069eaeea
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2511094
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | chip/max32660/i2c_chip.c | 4 | ||||
| -rw-r--r-- | chip/stm32/i2c-stm32f0.c | 4 | ||||
| -rw-r--r-- | chip/stm32/i2c-stm32f4.c | 4 | ||||
| -rw-r--r-- | chip/stm32/i2c-stm32l4.c | 4 | ||||
| -rw-r--r-- | include/system.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/chip/max32660/i2c_chip.c b/chip/max32660/i2c_chip.c index 201b42a8a8..54638cb5de 100644 --- a/chip/max32660/i2c_chip.c +++ b/chip/max32660/i2c_chip.c @@ -582,7 +582,7 @@ static void i2c_slave_handler(mxc_i2c_regs_t *i2c) i2c->int_en0 = MXC_F_I2C_INT_EN0_DONE | I2C_ERROR | MXC_F_I2C_INT_EN0_ADDR_MATCH; /* Inhibit sleep mode when addressed until STOPF flag is set. */ - disable_sleep(SLEEP_MASK_I2C_SLAVE); + disable_sleep(SLEEP_MASK_I2C_PERIPHERAL); } /* Check for DONE interrupt. */ @@ -615,7 +615,7 @@ static void i2c_slave_handler(mxc_i2c_regs_t *i2c) i2c_slave_service(req); /* No longer inhibit deep sleep after done. */ - enable_sleep(SLEEP_MASK_I2C_SLAVE); + enable_sleep(SLEEP_MASK_I2C_PERIPHERAL); } /* Check for an I2C Master Read or Write. */ diff --git a/chip/stm32/i2c-stm32f0.c b/chip/stm32/i2c-stm32f0.c index d56281f175..47bd6c4264 100644 --- a/chip/stm32/i2c-stm32f0.c +++ b/chip/stm32/i2c-stm32f0.c @@ -351,7 +351,7 @@ static void i2c_event_handler(int port) /* Clear ADDR bit by writing to ADDRCF bit */ STM32_I2C_ICR(port) |= STM32_I2C_ICR_ADDRCF; /* Inhibit sleep mode when addressed until STOPF flag is set */ - disable_sleep(SLEEP_MASK_I2C_SLAVE); + disable_sleep(SLEEP_MASK_I2C_PERIPHERAL); } /* Receiver full event */ @@ -380,7 +380,7 @@ static void i2c_event_handler(int port) STM32_I2C_ICR(port) |= STM32_I2C_ICR_STOPCF; /* No longer inhibit deep sleep after stop condition */ - enable_sleep(SLEEP_MASK_I2C_SLAVE); + enable_sleep(SLEEP_MASK_I2C_PERIPHERAL); } /* Controller requested STOP or RESTART */ diff --git a/chip/stm32/i2c-stm32f4.c b/chip/stm32/i2c-stm32f4.c index 4a609fe127..84cd667d2d 100644 --- a/chip/stm32/i2c-stm32f4.c +++ b/chip/stm32/i2c-stm32f4.c @@ -906,7 +906,7 @@ static void i2c_event_handler(int port) unused = STM32_I2C_SR1(port); unused = STM32_I2C_SR2(port); /* Inhibit stop mode when addressed until STOPF flag is set */ - disable_sleep(SLEEP_MASK_I2C_SLAVE); + disable_sleep(SLEEP_MASK_I2C_PERIPHERAL); } /* I2C in slave transmitter */ @@ -968,7 +968,7 @@ static void i2c_event_handler(int port) STM32_I2C_CR1(port) = i2c_cr1 | STM32_I2C_CR1_PE; /* No longer inhibit deep sleep after stop condition */ - enable_sleep(SLEEP_MASK_I2C_SLAVE); + enable_sleep(SLEEP_MASK_I2C_PERIPHERAL); } /* Enable again */ diff --git a/chip/stm32/i2c-stm32l4.c b/chip/stm32/i2c-stm32l4.c index b0304f375c..615b25f208 100644 --- a/chip/stm32/i2c-stm32l4.c +++ b/chip/stm32/i2c-stm32l4.c @@ -234,7 +234,7 @@ static void i2c_event_handler(int port) /* Clear ADDR bit by writing to ADDRCF bit */ STM32_I2C_ICR(port) |= STM32_I2C_ICR_ADDRCF; /* Inhibit stop mode when addressed until STOPF flag is set */ - disable_sleep(SLEEP_MASK_I2C_SLAVE); + disable_sleep(SLEEP_MASK_I2C_PERIPHERAL); } /* @@ -262,7 +262,7 @@ static void i2c_event_handler(int port) STM32_I2C_ICR(port) |= STM32_I2C_ICR_STOPCF; /* No longer inhibit deep sleep after stop condition */ - enable_sleep(SLEEP_MASK_I2C_SLAVE); + enable_sleep(SLEEP_MASK_I2C_PERIPHERAL); } if (isr & STM32_I2C_ISR_NACK) { diff --git a/include/system.h b/include/system.h index 965bf93abc..7c540e1d5e 100644 --- a/include/system.h +++ b/include/system.h @@ -466,7 +466,7 @@ enum { SLEEP_MASK_USB_PWR = BIT(4), /* USB power loop ongoing */ SLEEP_MASK_USB_PD = BIT(5), /* USB PD device connected */ SLEEP_MASK_SPI = BIT(6), /* SPI communications ongoing */ - SLEEP_MASK_I2C_SLAVE = BIT(7), /* I2C slave communication ongoing */ + SLEEP_MASK_I2C_PERIPHERAL = BIT(7), /* I2C peripheral comms ongoing */ SLEEP_MASK_FAN = BIT(8), /* Fan control loop ongoing */ SLEEP_MASK_USB_DEVICE = BIT(9), /* Generic USB device in use */ SLEEP_MASK_PWM = BIT(10), /* PWM output is enabled */ |