diff options
author | Caveh Jalali <caveh@chromium.org> | 2021-06-03 00:47:14 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-04 22:27:42 +0000 |
commit | 12906eb5285f119921b884baca2dd12f0f8ec92c (patch) | |
tree | 2725704737587ec52096a0e7b06c879b9f7cc08c /chip/npcx | |
parent | 15d41792a1f4d24a64ed4ebcaa809a48978ff385 (diff) | |
download | chrome-ec-12906eb5285f119921b884baca2dd12f0f8ec92c.tar.gz |
COIL: chip/npcx: rename IS_SLAVE_CHAN_ENABLE
This renames IS_SLAVE_CHAN_ENABLE to IS_PERIPHERAL_CHAN_ENABLE.
BRANCH=none
BUG=b:163885307
TEST=buildall and compare_build.sh pass
Change-Id: Iaab11a2485fdcde3992ecb457c204465acfdf732
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2938042
Reviewed-by: Harry Cutts <hcutts@chromium.org>
Commit-Queue: Harry Cutts <hcutts@chromium.org>
Diffstat (limited to 'chip/npcx')
-rw-r--r-- | chip/npcx/espi.c | 6 | ||||
-rw-r--r-- | chip/npcx/registers.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chip/npcx/espi.c b/chip/npcx/espi.c index 903e0be0a5..a8429afe89 100644 --- a/chip/npcx/espi.c +++ b/chip/npcx/espi.c @@ -584,10 +584,10 @@ void espi_interrupt(void) */ for (chan = NPCX_ESPI_CH_VW; chan < NPCX_ESPI_CH_COUNT; chan++) { - if (!IS_SLAVE_CHAN_ENABLE(chan) && + if (!IS_PERIPHERAL_CHAN_ENABLE(chan) && IS_HOST_CHAN_EN(chan)) ENABLE_ESPI_CHAN(chan); - else if (IS_SLAVE_CHAN_ENABLE(chan) && + else if (IS_PERIPHERAL_CHAN_ENABLE(chan) && !IS_HOST_CHAN_EN(chan)) DISABLE_ESPI_CHAN(chan); } @@ -598,7 +598,7 @@ void espi_interrupt(void) * completion of EC firmware code loading. */ if (boot_load_done == 0 && - IS_SLAVE_CHAN_ENABLE(NPCX_ESPI_CH_VW)) { + IS_PERIPHERAL_CHAN_ENABLE(NPCX_ESPI_CH_VW)) { espi_vw_set_wire( VW_PERIPHERAL_BTLD_STATUS_DONE, 1); diff --git a/chip/npcx/registers.h b/chip/npcx/registers.h index bacfe31982..ab7a28351a 100644 --- a/chip/npcx/registers.h +++ b/chip/npcx/registers.h @@ -1198,11 +1198,11 @@ enum PM_CHANNEL_T { #define NPCX_VWEVMS_VALID FIELD(4, 4) /* Macro functions for eSPI CFG & IE */ -#define IS_SLAVE_CHAN_ENABLE(ch) IS_BIT_SET(NPCX_ESPICFG, ch) +#define IS_PERIPHERAL_CHAN_ENABLE(ch) IS_BIT_SET(NPCX_ESPICFG, ch) #define IS_HOST_CHAN_EN(ch) IS_BIT_SET(NPCX_ESPICFG, (ch+4)) #define ENABLE_ESPI_CHAN(ch) SET_BIT(NPCX_ESPICFG, ch) #define DISABLE_ESPI_CHAN(ch) CLEAR_BIT(NPCX_ESPICFG, ch) -/* ESPI Slave Channel Support Definitions */ +/* ESPI Peripheral Channel Support Definitions */ #define ESPI_SUPP_CH_PC BIT(NPCX_ESPICFG_PCCHN_SUPP) #define ESPI_SUPP_CH_VM BIT(NPCX_ESPICFG_VWCHN_SUPP) #define ESPI_SUPP_CH_OOB BIT(NPCX_ESPICFG_OOBCHN_SUPP) |