From 273bdad8ef38e581895111556e1432bdf3201716 Mon Sep 17 00:00:00 2001 From: Caveh Jalali Date: Tue, 1 Jun 2021 22:42:28 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2932466 Reviewed-by: Craig Hesling Reviewed-by: Harry Cutts Commit-Queue: Craig Hesling --- board/burnet/board.c | 4 ++-- board/burnet/gpio.inc | 4 ++-- board/cerise/board.c | 4 ++-- board/cerise/gpio.inc | 4 ++-- board/damu/board.c | 4 ++-- board/damu/gpio.inc | 4 ++-- board/elm/board.c | 4 ++-- board/elm/gpio.inc | 2 +- board/fennel/board.c | 4 ++-- board/fennel/gpio.inc | 4 ++-- board/hammer/board.c | 2 +- board/hammer/gpio.inc | 2 +- board/hatch_fp/board_rw.c | 2 +- board/hatch_fp/gpio_rw.inc | 2 +- board/it83xx_evb/gpio.inc | 8 ++++---- board/it8xxx2_evb/gpio.inc | 8 ++++---- board/jacuzzi/board.c | 4 ++-- board/jacuzzi/gpio.inc | 4 ++-- board/makomo/board.c | 4 ++-- board/makomo/gpio.inc | 4 ++-- board/mchpevb1/board.c | 4 ++-- board/mchpevb1/gpio.inc | 4 ++-- board/nocturne_fp/board_rw.c | 2 +- board/nocturne_fp/gpio_rw.inc | 2 +- board/nucleo-dartmonkey/board.c | 2 +- board/nucleo-dartmonkey/gpio.inc | 2 +- board/oak/board.c | 2 +- board/oak/gpio.inc | 2 +- board/rainier/board.c | 4 ++-- board/rainier/gpio.inc | 2 +- board/scarlet/board.c | 4 ++-- board/scarlet/gpio.inc | 2 +- board/stern/board.c | 4 ++-- board/stern/gpio.inc | 4 ++-- board/willow/board.c | 4 ++-- board/willow/gpio.inc | 4 ++-- 36 files changed, 63 insertions(+), 63 deletions(-) (limited to 'board') diff --git a/board/burnet/board.c b/board/burnet/board.c index a4bf2cd59e..8bbd8bb94b 100644 --- a/board/burnet/board.c +++ b/board/burnet/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/burnet/gpio.inc b/board/burnet/gpio.inc index d46c6e7e70..c43a232870 100644 --- a/board/burnet/gpio.inc +++ b/board/burnet/gpio.inc @@ -116,5 +116,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) diff --git a/board/cerise/board.c b/board/cerise/board.c index 912a085900..ddad67cd77 100644 --- a/board/cerise/board.c +++ b/board/cerise/board.c @@ -277,7 +277,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, @@ -288,7 +288,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/cerise/gpio.inc b/board/cerise/gpio.inc index fbc887f740..d7d5b9837d 100644 --- a/board/cerise/gpio.inc +++ b/board/cerise/gpio.inc @@ -113,5 +113,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) diff --git a/board/damu/board.c b/board/damu/board.c index fbe027e3f0..f55b0f339c 100644 --- a/board/damu/board.c +++ b/board/damu/board.c @@ -277,7 +277,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, @@ -288,7 +288,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/damu/gpio.inc b/board/damu/gpio.inc index ba565b4772..9ee4035917 100644 --- a/board/damu/gpio.inc +++ b/board/damu/gpio.inc @@ -111,5 +111,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) 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 */ 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) diff --git a/board/hammer/board.c b/board/hammer/board.c index e0218b322f..7ccd37cf9c 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -214,7 +214,7 @@ static void board_init(void) clock_wait_bus_cycles(BUS_APB, 1); /* Enable SPI for touchpad */ - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); spi_enable(&spi_devices[SPI_ST_TP_DEVICE_ID], 1); #endif /* HAS_SPI_TOUCHPAD */ } diff --git a/board/hammer/gpio.inc b/board/hammer/gpio.inc index a94c0aa7e4..8372d4fc4b 100644 --- a/board/hammer/gpio.inc +++ b/board/hammer/gpio.inc @@ -126,7 +126,7 @@ ALTERNATE(PIN_MASK(B, 0x0c00), 1, MODULE_I2C, 0) /* I2C CHARGER: PB10/11 GPIO_O #endif #ifdef HAS_SPI_TOUCHPAD -ALTERNATE(PIN_MASK(B, 0x0038), 0, MODULE_SPI_MASTER, 0) /* SPI MASTER:PB3/4/5 */ +ALTERNATE(PIN_MASK(B, 0x0038), 0, MODULE_SPI_CONTROLLER, 0) /* SPI MASTER:PB3/4/5 */ #endif #ifdef CONFIG_I2C diff --git a/board/hatch_fp/board_rw.c b/board/hatch_fp/board_rw.c index bfea56508c..6b8cc34e30 100644 --- a/board/hatch_fp/board_rw.c +++ b/board/hatch_fp/board_rw.c @@ -68,7 +68,7 @@ const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); static void configure_fp_sensor_spi(void) { /* Configure SPI GPIOs */ - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); /* Set all SPI master signal pins to very high speed: B12/13/14/15 */ STM32_GPIO_OSPEEDR(GPIO_B) |= 0xff000000; diff --git a/board/hatch_fp/gpio_rw.inc b/board/hatch_fp/gpio_rw.inc index fdc6428b3a..8dcadd68c2 100644 --- a/board/hatch_fp/gpio_rw.inc +++ b/board/hatch_fp/gpio_rw.inc @@ -27,4 +27,4 @@ GPIO(USER_PRES_L, PIN(B, 9), GPIO_ODR_HIGH) * configured it as a GPIO above and the SPI_MASTER module expects to use it * in software NSS management mode, not hardware management mode. */ -ALTERNATE(PIN_MASK(B, 0xE000), GPIO_ALT_SPI, MODULE_SPI_MASTER, GPIO_PULL_DOWN) +ALTERNATE(PIN_MASK(B, 0xE000), GPIO_ALT_SPI, MODULE_SPI_CONTROLLER, GPIO_PULL_DOWN) diff --git a/board/it83xx_evb/gpio.inc b/board/it83xx_evb/gpio.inc index 9f96b5f325..52df89e5cb 100644 --- a/board/it83xx_evb/gpio.inc +++ b/board/it83xx_evb/gpio.inc @@ -56,10 +56,10 @@ ALTERNATE(PIN_MASK(B, 0x03), 1, MODULE_UART, GPIO_PULL_UP) /* UART1 */ #ifdef CONFIG_UART_HOST ALTERNATE(PIN_MASK(H, 0x06), 1, MODULE_UART, 0) /* UART2 */ #endif -ALTERNATE(PIN_MASK(A, 0x40), 3, MODULE_SPI_MASTER, 0) /* SSCK of SPI */ -ALTERNATE(PIN_MASK(C, 0x28), 3, MODULE_SPI_MASTER, 0) /* SMOSI/SMISO of SPI */ -ALTERNATE(PIN_MASK(G, 0x01), 3, MODULE_SPI_MASTER, 0) /* SSCE1# of SPI */ -ALTERNATE(PIN_MASK(G, 0x04), 3, MODULE_SPI_MASTER, 0) /* SSCE0# of SPI */ +ALTERNATE(PIN_MASK(A, 0x40), 3, MODULE_SPI_CONTROLLER, 0) /* SSCK of SPI */ +ALTERNATE(PIN_MASK(C, 0x28), 3, MODULE_SPI_CONTROLLER, 0) /* SMOSI/SMISO of SPI */ +ALTERNATE(PIN_MASK(G, 0x01), 3, MODULE_SPI_CONTROLLER, 0) /* SSCE1# of SPI */ +ALTERNATE(PIN_MASK(G, 0x04), 3, MODULE_SPI_CONTROLLER, 0) /* SSCE0# of SPI */ ALTERNATE(PIN_MASK(A, 0x80), 1, MODULE_PWM, 0) /* PWM7 for FAN1 */ ALTERNATE(PIN_MASK(D, 0x40), 3, MODULE_PWM, 0) /* TACH0A for FAN1 */ ALTERNATE(PIN_MASK(B, 0x18), 1, MODULE_I2C, 0) /* I2C A SCL/SDA */ diff --git a/board/it8xxx2_evb/gpio.inc b/board/it8xxx2_evb/gpio.inc index 008034cfb3..8a7f593ab6 100644 --- a/board/it8xxx2_evb/gpio.inc +++ b/board/it8xxx2_evb/gpio.inc @@ -56,10 +56,10 @@ ALTERNATE(PIN_MASK(B, 0x03), 1, MODULE_UART, GPIO_PULL_UP) /* UART1 */ #ifdef CONFIG_UART_HOST ALTERNATE(PIN_MASK(H, 0x06), 1, MODULE_UART, 0) /* UART2 */ #endif -ALTERNATE(PIN_MASK(A, 0x40), 3, MODULE_SPI_MASTER, 0) /* SSCK of SPI */ -ALTERNATE(PIN_MASK(C, 0x28), 3, MODULE_SPI_MASTER, 0) /* SMOSI/SMISO of SPI */ -ALTERNATE(PIN_MASK(G, 0x01), 3, MODULE_SPI_MASTER, 0) /* SSCE1# of SPI */ -ALTERNATE(PIN_MASK(G, 0x04), 3, MODULE_SPI_MASTER, 0) /* SSCE0# of SPI */ +ALTERNATE(PIN_MASK(A, 0x40), 3, MODULE_SPI_CONTROLLER, 0) /* SSCK of SPI */ +ALTERNATE(PIN_MASK(C, 0x28), 3, MODULE_SPI_CONTROLLER, 0) /* SMOSI/SMISO of SPI */ +ALTERNATE(PIN_MASK(G, 0x01), 3, MODULE_SPI_CONTROLLER, 0) /* SSCE1# of SPI */ +ALTERNATE(PIN_MASK(G, 0x04), 3, MODULE_SPI_CONTROLLER, 0) /* SSCE0# of SPI */ ALTERNATE(PIN_MASK(A, 0x80), 1, MODULE_PWM, 0) /* PWM7 for FAN1 */ ALTERNATE(PIN_MASK(D, 0x40), 3, MODULE_PWM, 0) /* TACH0A for FAN1 */ ALTERNATE(PIN_MASK(B, 0x18), 1, MODULE_I2C, 0) /* I2C A SCL/SDA */ diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index e7ab8ed044..c0594decf3 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -281,7 +281,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, @@ -292,7 +292,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/jacuzzi/gpio.inc b/board/jacuzzi/gpio.inc index b92c4b082e..60288e7195 100644 --- a/board/jacuzzi/gpio.inc +++ b/board/jacuzzi/gpio.inc @@ -122,5 +122,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) diff --git a/board/makomo/board.c b/board/makomo/board.c index a5c04c7855..04d752500b 100644 --- a/board/makomo/board.c +++ b/board/makomo/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/makomo/gpio.inc b/board/makomo/gpio.inc index b07f678e9f..287ebbda1f 100644 --- a/board/makomo/gpio.inc +++ b/board/makomo/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) 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 diff --git a/board/nocturne_fp/board_rw.c b/board/nocturne_fp/board_rw.c index f9ca66cc5d..9ace6c437e 100644 --- a/board/nocturne_fp/board_rw.c +++ b/board/nocturne_fp/board_rw.c @@ -71,7 +71,7 @@ static void spi_configure(enum fp_sensor_spi_select spi_select) gpio_set_flags_by_mask(GPIO_E, 0x7000, 0); gpio_set_alternate_function(GPIO_E, 0x7000, GPIO_ALT_SPI); } else { - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); } /* Set all SPI master signal pins to very high speed: pins E2/4/5/6 */ diff --git a/board/nocturne_fp/gpio_rw.inc b/board/nocturne_fp/gpio_rw.inc index d23e980b30..65036abe14 100644 --- a/board/nocturne_fp/gpio_rw.inc +++ b/board/nocturne_fp/gpio_rw.inc @@ -37,7 +37,7 @@ GPIO(SPI4_ALT_NSS, PIN(E, 11), GPIO_OUT_HIGH) GPIO(USER_PRES_L, PIN(C, 5), GPIO_ODR_HIGH) /* Default SPI4 master to sensor: PE2/5/6 (CLK/MISO/MOSI) */ -ALTERNATE(PIN_MASK(E, 0x0064), GPIO_ALT_SPI, MODULE_SPI_MASTER, 0) +ALTERNATE(PIN_MASK(E, 0x0064), GPIO_ALT_SPI, MODULE_SPI_CONTROLLER, 0) /* See board_rw.c for the alternate configuration that we use on * development boards, which overrides the UNUSED values below. diff --git a/board/nucleo-dartmonkey/board.c b/board/nucleo-dartmonkey/board.c index ee84c262a7..9189fbcf29 100644 --- a/board/nucleo-dartmonkey/board.c +++ b/board/nucleo-dartmonkey/board.c @@ -69,7 +69,7 @@ const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); static void spi_configure(void) { /* Configure SPI GPIOs */ - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); /* Set all SPI master signal pins to very high speed: pins E2/4/5/6 */ STM32_GPIO_OSPEEDR(GPIO_E) |= 0x00003f30; /* Enable clocks to SPI4 module (master) */ diff --git a/board/nucleo-dartmonkey/gpio.inc b/board/nucleo-dartmonkey/gpio.inc index e20027a8ff..2028add873 100644 --- a/board/nucleo-dartmonkey/gpio.inc +++ b/board/nucleo-dartmonkey/gpio.inc @@ -25,4 +25,4 @@ GPIO_INT(FPS_INT, PIN(A, 0), GPIO_INT_RISING, fps_event) GPIO(FP_RST_ODL, PIN(E, 0), GPIO_OUT_HIGH) GPIO(SPI4_NSS, PIN(E, 4), GPIO_OUT_HIGH) /* SPI4 master to sensor: PE2/5/6 (CLK/MISO/MOSI) */ -ALTERNATE(PIN_MASK(E, 0x0064), GPIO_ALT_SPI, MODULE_SPI_MASTER, 0) +ALTERNATE(PIN_MASK(E, 0x0064), GPIO_ALT_SPI, MODULE_SPI_CONTROLLER, 0) diff --git a/board/oak/board.c b/board/oak/board.c index 9d8abb52ab..e631395fa2 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -279,7 +279,7 @@ static void board_init(void) STM32_DMA_CSELR(STM32_DMAC_CH6) |= (3 << 20) | (3 << 24); /* Enable SPI for BMI160 */ - 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 */ diff --git a/board/oak/gpio.inc b/board/oak/gpio.inc index 70bb3a7bba..3789f3ec35 100644 --- a/board/oak/gpio.inc +++ b/board/oak/gpio.inc @@ -210,5 +210,5 @@ 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 */ #if BOARD_REV >= OAK_REV5 -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 */ #endif diff --git a/board/rainier/board.c b/board/rainier/board.c index 1a95addd9d..ecb42f17d2 100644 --- a/board/rainier/board.c +++ b/board/rainier/board.c @@ -191,7 +191,7 @@ int pd_snk_is_vbus_provided(int port) static void board_spi_enable(void) { - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); /* Enable clocks to SPI2 module */ STM32_RCC_APB1ENR |= STM32_RCC_PB1_SPI2; @@ -213,7 +213,7 @@ static void board_spi_disable(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); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_spi_disable, diff --git a/board/rainier/gpio.inc b/board/rainier/gpio.inc index 65bbfe1d6f..f5a4f360b3 100644 --- a/board/rainier/gpio.inc +++ b/board/rainier/gpio.inc @@ -90,4 +90,4 @@ ALTERNATE(PIN_MASK(B, 0x0038), 0, MODULE_SPI, 0) /* SPI SLAVE CS: PA15 */ ALTERNATE(PIN_MASK(A, 0x8000), 0, MODULE_SPI, 0) /* SPI MASTER: PD1/3/4 */ -ALTERNATE(PIN_MASK(D, 0x001a), 1, MODULE_SPI_MASTER, 0) +ALTERNATE(PIN_MASK(D, 0x001a), 1, MODULE_SPI_CONTROLLER, 0) diff --git a/board/scarlet/board.c b/board/scarlet/board.c index 403beb768b..78e8935cd2 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -230,7 +230,7 @@ int pd_snk_is_vbus_provided(int port) static void board_spi_enable(void) { - gpio_config_module(MODULE_SPI_MASTER, 1); + gpio_config_module(MODULE_SPI_CONTROLLER, 1); /* Enable clocks to SPI2 module */ STM32_RCC_APB1ENR |= STM32_RCC_PB1_SPI2; @@ -252,7 +252,7 @@ static void board_spi_disable(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); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_spi_disable, diff --git a/board/scarlet/gpio.inc b/board/scarlet/gpio.inc index bfede671a8..9c45295a7f 100644 --- a/board/scarlet/gpio.inc +++ b/board/scarlet/gpio.inc @@ -99,4 +99,4 @@ ALTERNATE(PIN_MASK(B, 0x0038), 0, MODULE_SPI, 0) /* SPI SLAVE CS: PA15 */ ALTERNATE(PIN_MASK(A, 0x8000), 0, MODULE_SPI, 0) /* SPI MASTER: PD1/3/4 */ -ALTERNATE(PIN_MASK(D, 0x001a), 1, MODULE_SPI_MASTER, 0) +ALTERNATE(PIN_MASK(D, 0x001a), 1, MODULE_SPI_CONTROLLER, 0) diff --git a/board/stern/board.c b/board/stern/board.c index 9dacb29187..fcbd769f7c 100644 --- a/board/stern/board.c +++ b/board/stern/board.c @@ -277,7 +277,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, @@ -288,7 +288,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/stern/gpio.inc b/board/stern/gpio.inc index 51972ec367..3a162d6124 100644 --- a/board/stern/gpio.inc +++ b/board/stern/gpio.inc @@ -111,5 +111,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) diff --git a/board/willow/board.c b/board/willow/board.c index 3aad2b476e..b6e62e35ee 100644 --- a/board/willow/board.c +++ b/board/willow/board.c @@ -275,7 +275,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, @@ -286,7 +286,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/willow/gpio.inc b/board/willow/gpio.inc index c3e4e92b67..9c1bffe194 100644 --- a/board/willow/gpio.inc +++ b/board/willow/gpio.inc @@ -116,5 +116,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) -- cgit v1.2.1