diff options
author | Caveh Jalali <caveh@chromium.org> | 2021-06-01 22:42:28 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-03 21:51:02 +0000 |
commit | 273bdad8ef38e581895111556e1432bdf3201716 (patch) | |
tree | 6c5bac26007a77cab856346160dece195ded1a28 /board/mchpevb1 | |
parent | 14d69d56632b502821aacf5d772e9cde5c9b083e (diff) | |
download | chrome-ec-273bdad8ef38e581895111556e1432bdf3201716.tar.gz |
COIL: Rename MODULE_SPI_MASTER to MODULE_SPI_CONTROLLER
This renames the MODULE_SPI_MASTER to MODULE_SPI_CONTROLLER.
BRANCH=none
BUG=b:181607131
TEST=make buildall passes;
"compare_build.sh -b all" shows no difference
Change-Id: I4d33f57fd82c5b57f111c12387113dc82cebe60b
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2932466
Reviewed-by: Craig Hesling <hesling@chromium.org>
Reviewed-by: Harry Cutts <hcutts@chromium.org>
Commit-Queue: Craig Hesling <hesling@chromium.org>
Diffstat (limited to 'board/mchpevb1')
-rw-r--r-- | board/mchpevb1/board.c | 4 | ||||
-rw-r--r-- | board/mchpevb1/gpio.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c index 96529cf3d7..2372dbe5f4 100644 --- a/board/mchpevb1/board.c +++ b/board/mchpevb1/board.c @@ -304,7 +304,7 @@ void board_prepare_for_deep_sleep(void) #if defined(CONFIG_GPIO_POWER_DOWN) && \ defined(CONFIG_MCHP_DEEP_SLP_GPIO_PWR_DOWN) gpio_power_down_module(MODULE_SPI_FLASH); - gpio_power_down_module(MODULE_SPI_MASTER); + gpio_power_down_module(MODULE_SPI_CONTROLLER); gpio_power_down_module(MODULE_I2C); /* powering down keyscan is causing an issue with keyscan task * probably due to spurious interrupts on keyscan pins. @@ -331,7 +331,7 @@ void board_resume_from_deep_sleep(void) #endif /* gpio_config_module(MODULE_KEYBOARD_SCAN, 1); */ gpio_config_module(MODULE_SPI_FLASH, 1); - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); gpio_config_module(MODULE_I2C, 1); #endif } diff --git a/board/mchpevb1/gpio.inc b/board/mchpevb1/gpio.inc index 4ba5bd15df..8be1099fbd 100644 --- a/board/mchpevb1/gpio.inc +++ b/board/mchpevb1/gpio.inc @@ -398,8 +398,8 @@ ALTERNATE(PIN_MASK(1, 0x100000), 1, MODULE_LPC, GPIO_PULL_UP) * SPI0_MISO = GPIO_0036 Func 2 Bank 0, bit 30 * SPI0_MOSI = GPIO_0004 Func 2 Bank 0, bit 4 */ -ALTERNATE(PIN_MASK(0, 0x00000008), 0, MODULE_SPI_MASTER, GPIO_ODR_HIGH) -ALTERNATE(PIN_MASK(0, 0x50000010), 2, MODULE_SPI_MASTER, 0) +ALTERNATE(PIN_MASK(0, 0x00000008), 0, MODULE_SPI_CONTROLLER, GPIO_ODR_HIGH) +ALTERNATE(PIN_MASK(0, 0x50000010), 2, MODULE_SPI_CONTROLLER, 0) /* I2C pins */ /* Using SMB00 as function 2 GP-SPI0 |