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/fennel | |
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/fennel')
-rw-r--r-- | board/fennel/board.c | 4 | ||||
-rw-r--r-- | board/fennel/gpio.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/fennel/board.c b/board/fennel/board.c index 9d059e5886..0d9e14e1f5 100644 --- a/board/fennel/board.c +++ b/board/fennel/board.c @@ -276,7 +276,7 @@ static void board_spi_enable(void) spi_enable(&spi_devices[0], 1); /* Pin mux spi peripheral toward the sensor. */ - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_spi_enable, @@ -287,7 +287,7 @@ static void board_spi_disable(void) /* Set pins to a state calming the sensor down. */ gpio_set_flags(GPIO_EC_SENSOR_SPI_CK, GPIO_OUT_LOW); gpio_set_level(GPIO_EC_SENSOR_SPI_CK, 0); - gpio_config_module(MODULE_SPI_MASTER, 0); + gpio_config_module(MODULE_SPI_CONTROLLER, 0); /* Disable spi peripheral and clocks. */ spi_enable(&spi_devices[0], 0); diff --git a/board/fennel/gpio.inc b/board/fennel/gpio.inc index 3dccd94506..28d4035031 100644 --- a/board/fennel/gpio.inc +++ b/board/fennel/gpio.inc @@ -117,5 +117,5 @@ ALTERNATE(PIN_MASK(A, 0x8000), 0, MODULE_SPI, 0) /* EMMC SPI SLAVE: PB13/14/15 */ ALTERNATE(PIN_MASK(B, 0xE000), 0, MODULE_SPI_FLASH, 0) /* SENSORS SPI MASTER: PB10, PB12, PC2, PC3 */ -ALTERNATE(PIN_MASK(B, 0x0400), 5, MODULE_SPI_MASTER, 0) -ALTERNATE(PIN_MASK(C, 0x000C), 1, MODULE_SPI_MASTER, 0) +ALTERNATE(PIN_MASK(B, 0x0400), 5, MODULE_SPI_CONTROLLER, 0) +ALTERNATE(PIN_MASK(C, 0x000C), 1, MODULE_SPI_CONTROLLER, 0) |