diff options
author | Tom Hughes <tomhughes@chromium.org> | 2021-01-26 11:36:48 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-01-28 01:08:04 +0000 |
commit | b5a0fdab0680fd93b0b7b08a139a5fdcbb679ee6 (patch) | |
tree | e950d8969881d4f8b8978b349b94b9c7085eb3e5 /board | |
parent | c60037148c629e4947b67287b88c3abf701e2040 (diff) | |
download | chrome-ec-b5a0fdab0680fd93b0b7b08a139a5fdcbb679ee6.tar.gz |
spi: Pass in spi_device as argument to spi_enable instead of port
Rather than passing in the port and iterating over the global
spi_devices variable, pass in the specific spi_device that is being
enabled/disabled. The spi_device_t struct has the port.
This change makes the functions in spi.h more consistent since they now
all take a spi_device_t*. This change is the first step in making the
SPI configuration more dynamic.
BRANCH=none
BUG=b:177908650
TEST=git grep 'spi_enable(CONFIG' => no results
TEST=make buildall
TEST=Flash dragonclaw v0.2 and view console to verify FP sensor ID
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I64124e0ebcf898e88496acb77703b5f59ae931c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2654081
Commit-Queue: Abe Levkoy <alevkoy@chromium.org>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/burnet/board.c | 4 | ||||
-rw-r--r-- | board/c2d2/board.c | 4 | ||||
-rw-r--r-- | board/cerise/board.c | 4 | ||||
-rw-r--r-- | board/damu/board.c | 4 | ||||
-rw-r--r-- | board/discovery-stm32f072/board.c | 4 | ||||
-rw-r--r-- | board/elm/board.c | 4 | ||||
-rw-r--r-- | board/fennel/board.c | 4 | ||||
-rw-r--r-- | board/hammer/board.c | 4 | ||||
-rw-r--r-- | board/hatch_fp/board.c | 2 | ||||
-rw-r--r-- | board/jacuzzi/board.c | 4 | ||||
-rw-r--r-- | board/mchpevb1/board.c | 4 | ||||
-rw-r--r-- | board/nocturne_fp/board.c | 2 | ||||
-rw-r--r-- | board/nucleo-dartmonkey/board.c | 2 | ||||
-rw-r--r-- | board/oak/board.c | 2 | ||||
-rw-r--r-- | board/rainier/board.c | 4 | ||||
-rw-r--r-- | board/scarlet/board.c | 4 | ||||
-rw-r--r-- | board/servo_micro/board.c | 4 | ||||
-rw-r--r-- | board/stern/board.c | 4 | ||||
-rw-r--r-- | board/willow/board.c | 4 |
19 files changed, 34 insertions, 34 deletions
diff --git a/board/burnet/board.c b/board/burnet/board.c index f4a11d3d92..87d027ad3f 100644 --- a/board/burnet/board.c +++ b/board/burnet/board.c @@ -270,7 +270,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; /* Reinitialize spi peripheral. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); /* Pin mux spi peripheral toward the sensor. */ gpio_config_module(MODULE_SPI_MASTER, 1); @@ -287,7 +287,7 @@ static void board_spi_disable(void) gpio_config_module(MODULE_SPI_MASTER, 0); /* Disable spi peripheral and clocks. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, diff --git a/board/c2d2/board.c b/board/c2d2/board.c index 7e8af674c1..1cf4728f12 100644 --- a/board/c2d2/board.c +++ b/board/c2d2/board.c @@ -341,12 +341,12 @@ void usb_spi_board_enable(struct usb_spi_config const *config) STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; - spi_enable(CONFIG_SPI_FLASH_PORT, 1); + spi_enable(&spi_devices[0], 1); } void usb_spi_board_disable(struct usb_spi_config const *config) { - spi_enable(CONFIG_SPI_FLASH_PORT, 0); + spi_enable(&spi_devices[0], 0); /* Disable clocks to SPI2 module */ STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; diff --git a/board/cerise/board.c b/board/cerise/board.c index 585f40197c..306de802e4 100644 --- a/board/cerise/board.c +++ b/board/cerise/board.c @@ -274,7 +274,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; /* Reinitialize spi peripheral. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); /* Pin mux spi peripheral toward the sensor. */ gpio_config_module(MODULE_SPI_MASTER, 1); @@ -291,7 +291,7 @@ static void board_spi_disable(void) gpio_config_module(MODULE_SPI_MASTER, 0); /* Disable spi peripheral and clocks. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, diff --git a/board/damu/board.c b/board/damu/board.c index b4ad13b3e8..079920401e 100644 --- a/board/damu/board.c +++ b/board/damu/board.c @@ -274,7 +274,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; /* Reinitialize spi peripheral. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); /* Pin mux spi peripheral toward the sensor. */ gpio_config_module(MODULE_SPI_MASTER, 1); @@ -291,7 +291,7 @@ static void board_spi_disable(void) gpio_config_module(MODULE_SPI_MASTER, 0); /* Disable spi peripheral and clocks. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, diff --git a/board/discovery-stm32f072/board.c b/board/discovery-stm32f072/board.c index b1b9346cd3..c7099f55d1 100644 --- a/board/discovery-stm32f072/board.c +++ b/board/discovery-stm32f072/board.c @@ -175,12 +175,12 @@ void usb_spi_board_enable(struct usb_spi_config const *config) STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; - spi_enable(CONFIG_SPI_FLASH_PORT, 1); + spi_enable(&spi_devices[0], 1); } void usb_spi_board_disable(struct usb_spi_config const *config) { - spi_enable(CONFIG_SPI_FLASH_PORT, 0); + spi_enable(&spi_devices[0], 0); /* Disable clocks to SPI2 module */ STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; diff --git a/board/elm/board.c b/board/elm/board.c index 9a8b412520..accb1ea8a3 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -403,7 +403,7 @@ static void board_chipset_pre_init(void) STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); } DECLARE_HOOK(HOOK_CHIPSET_PRE_INIT, board_chipset_pre_init, HOOK_PRIO_DEFAULT); @@ -413,7 +413,7 @@ static void board_chipset_shutdown(void) /* Disable level shift to SoC when shutting down */ gpio_set_level(GPIO_LEVEL_SHIFT_EN_L, 1); - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); /* Disable clocks to SPI2 module */ STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; diff --git a/board/fennel/board.c b/board/fennel/board.c index 59c6b47651..a5848c61e3 100644 --- a/board/fennel/board.c +++ b/board/fennel/board.c @@ -273,7 +273,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; /* Reinitialize spi peripheral. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); /* Pin mux spi peripheral toward the sensor. */ gpio_config_module(MODULE_SPI_MASTER, 1); @@ -290,7 +290,7 @@ static void board_spi_disable(void) gpio_config_module(MODULE_SPI_MASTER, 0); /* Disable spi peripheral and clocks. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, diff --git a/board/hammer/board.c b/board/hammer/board.c index d64d4975ad..e0218b322f 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -196,7 +196,7 @@ static void board_init(void) #endif #ifdef HAS_SPI_TOUCHPAD - spi_enable(CONFIG_SPI_TOUCHPAD_PORT, 0); + spi_enable(&spi_devices[SPI_ST_TP_DEVICE_ID], 0); /* Disable SPI passthrough when the system is locked */ usb_spi_enable(&usb_spi, system_is_locked()); @@ -215,7 +215,7 @@ static void board_init(void) clock_wait_bus_cycles(BUS_APB, 1); /* Enable SPI for touchpad */ gpio_config_module(MODULE_SPI_MASTER, 1); - spi_enable(CONFIG_SPI_TOUCHPAD_PORT, 1); + spi_enable(&spi_devices[SPI_ST_TP_DEVICE_ID], 1); #endif /* HAS_SPI_TOUCHPAD */ } /* This needs to happen before PWM is initialized. */ diff --git a/board/hatch_fp/board.c b/board/hatch_fp/board.c index 9d3fcd1253..51eeb4ce99 100644 --- a/board/hatch_fp/board.c +++ b/board/hatch_fp/board.c @@ -84,7 +84,7 @@ static void configure_fp_sensor_spi(void) /* Enable clocks to SPI2 module (master) */ STM32_RCC_APB1ENR |= STM32_RCC_PB1_SPI2; - spi_enable(CONFIG_SPI_FP_PORT, 1); + spi_enable(&spi_devices[0], 1); } /* Initialize board. */ diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index 6c3707ce10..dc5bf2d21d 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -278,7 +278,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; /* Reinitialize spi peripheral. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); /* Pin mux spi peripheral toward the sensor. */ gpio_config_module(MODULE_SPI_MASTER, 1); @@ -295,7 +295,7 @@ static void board_spi_disable(void) gpio_config_module(MODULE_SPI_MASTER, 0); /* Disable spi peripheral and clocks. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c index 0a502f632c..b80db787cd 100644 --- a/board/mchpevb1/board.c +++ b/board/mchpevb1/board.c @@ -999,7 +999,7 @@ static void board_spi_enable(void) { trace0(0, BRD, 0, "HOOK_CHIPSET_STARTUP - board_spi_enable"); - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[1], 1); /* Toggle SPI chip select to switch BMI160 from I2C mode * to SPI mode @@ -1014,7 +1014,7 @@ DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_spi_enable, static void board_spi_disable(void) { trace0(0, BRD, 0, "HOOK_CHIPSET_SHUTDOWN - board_spi_disable"); - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[1], 0); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_spi_disable, MOTION_SENSE_HOOK_PRIO + 1); diff --git a/board/nocturne_fp/board.c b/board/nocturne_fp/board.c index c12003577f..e4886f3cc8 100644 --- a/board/nocturne_fp/board.c +++ b/board/nocturne_fp/board.c @@ -76,7 +76,7 @@ static void spi_configure(void) /* Enable clocks to SPI4 module (master) */ STM32_RCC_APB2ENR |= STM32_RCC_PB2_SPI4; - spi_enable(CONFIG_SPI_FP_PORT, 1); + spi_enable(&spi_devices[0], 1); } /* Initialize board. */ diff --git a/board/nucleo-dartmonkey/board.c b/board/nucleo-dartmonkey/board.c index ea5a921aa7..5e81b37a6b 100644 --- a/board/nucleo-dartmonkey/board.c +++ b/board/nucleo-dartmonkey/board.c @@ -75,7 +75,7 @@ static void spi_configure(void) /* Enable clocks to SPI4 module (master) */ STM32_RCC_APB2ENR |= STM32_RCC_PB2_SPI4; - spi_enable(CONFIG_SPI_FP_PORT, 1); + spi_enable(&spi_devices[0], 1); } /* Initialize board. */ diff --git a/board/oak/board.c b/board/oak/board.c index 2c76cdc98b..7a2d9c5698 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -294,7 +294,7 @@ static void board_init(void) STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); CPRINTS("Board using SPI sensors"); #endif } diff --git a/board/rainier/board.c b/board/rainier/board.c index 2d5140eed6..3fa159a8f0 100644 --- a/board/rainier/board.c +++ b/board/rainier/board.c @@ -200,7 +200,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_spi_enable, @@ -208,7 +208,7 @@ DECLARE_HOOK(HOOK_CHIPSET_STARTUP, static void board_spi_disable(void) { - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); /* Disable clocks to SPI2 module */ STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; diff --git a/board/scarlet/board.c b/board/scarlet/board.c index c1beb0882a..4544aa551c 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -239,7 +239,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_spi_enable, @@ -247,7 +247,7 @@ DECLARE_HOOK(HOOK_CHIPSET_STARTUP, static void board_spi_disable(void) { - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); /* Disable clocks to SPI2 module */ STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; diff --git a/board/servo_micro/board.c b/board/servo_micro/board.c index 6bbbd85c84..8074ba38ab 100644 --- a/board/servo_micro/board.c +++ b/board/servo_micro/board.c @@ -350,12 +350,12 @@ void usb_spi_board_enable(struct usb_spi_config const *config) STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; - spi_enable(CONFIG_SPI_FLASH_PORT, 1); + spi_enable(&spi_devices[0], 1); } void usb_spi_board_disable(struct usb_spi_config const *config) { - spi_enable(CONFIG_SPI_FLASH_PORT, 0); + spi_enable(&spi_devices[0], 0); /* Disable clocks to SPI2 module */ STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; diff --git a/board/stern/board.c b/board/stern/board.c index ac6e2775fa..e2782ebbd3 100644 --- a/board/stern/board.c +++ b/board/stern/board.c @@ -274,7 +274,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; /* Reinitialize spi peripheral. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); /* Pin mux spi peripheral toward the sensor. */ gpio_config_module(MODULE_SPI_MASTER, 1); @@ -291,7 +291,7 @@ static void board_spi_disable(void) gpio_config_module(MODULE_SPI_MASTER, 0); /* Disable spi peripheral and clocks. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, diff --git a/board/willow/board.c b/board/willow/board.c index d8b5e82b44..b673a6a02f 100644 --- a/board/willow/board.c +++ b/board/willow/board.c @@ -273,7 +273,7 @@ static void board_spi_enable(void) STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; /* Reinitialize spi peripheral. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + spi_enable(&spi_devices[0], 1); /* Pin mux spi peripheral toward the sensor. */ gpio_config_module(MODULE_SPI_MASTER, 1); @@ -290,7 +290,7 @@ static void board_spi_disable(void) gpio_config_module(MODULE_SPI_MASTER, 0); /* Disable spi peripheral and clocks. */ - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + spi_enable(&spi_devices[0], 0); STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, |