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/elm | |
| 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/elm')
| -rw-r--r-- | board/elm/board.c | 4 | ||||
| -rw-r--r-- | board/elm/gpio.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/board/elm/board.c b/board/elm/board.c index 8a6e2940be..6baa70b8c8 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -388,7 +388,7 @@ static void board_chipset_pre_init(void) board_extpower_buffer_to_soc(); /* Enable SPI for KX022 */ - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); /* Set all four SPI pins to high speed */ /* pins D0/D1/D3/D4 */ @@ -418,7 +418,7 @@ static void board_chipset_shutdown(void) /* Disable clocks to SPI2 module */ STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; - gpio_config_module(MODULE_SPI_MASTER, 0); + gpio_config_module(MODULE_SPI_CONTROLLER, 0); /* * Calling gpio_config_module sets disabled alternate function pins to diff --git a/board/elm/gpio.inc b/board/elm/gpio.inc index 246c97edcd..0dc89269ba 100644 --- a/board/elm/gpio.inc +++ b/board/elm/gpio.inc @@ -110,4 +110,4 @@ ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, GPIO_PULL_UP) /* USART1: PA9/PA10 ALTERNATE(PIN_MASK(B, 0x00c0), 1, MODULE_I2C, 0) /* I2C MASTER:PB6/7 */ ALTERNATE(PIN_MASK(B, 0x6000), 5, MODULE_I2C, 0) /* I2C MASTER:PB13/14 */ ALTERNATE(PIN_MASK(A, 0x00f0), 0, MODULE_SPI, 0) /* SPI SLAVE:PA4/5/6/7 */ -ALTERNATE(PIN_MASK(D, 0x001A), 1, MODULE_SPI_MASTER, 0) /* SPI MASTER:PD1/3/4 */ +ALTERNATE(PIN_MASK(D, 0x001A), 1, MODULE_SPI_CONTROLLER, 0) /* SPI MASTER:PD1/3/4 */ |