diff options
| author | Devin Lu <devin.lu@quantatw.com> | 2020-09-25 20:14:00 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-29 06:36:10 +0000 |
| commit | ad7938835f0c5260ce1887154aac7eab720b8dcf (patch) | |
| tree | 19598abab0cd89f5bef90061fcd2aaa9bc3c0486 | |
| parent | c499a64775eaa25904a4e1716f8b7f3b0b75bf85 (diff) | |
| download | chrome-ec-ad7938835f0c5260ce1887154aac7eab720b8dcf.tar.gz | |
Burnet: unmux pins away from emmc once we want to talk to sensors
Apply CL:2043151 to burnet.
BUG=b:169259387
BRANCH=firmware-kukui-12573.B
TEST=Boot Burnet, no sensor init fail.
TEST=emmc still works.
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Change-Id: Ic4bde54ab3bf2b1482230335fe5d2b71dc72faa6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2430908
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | board/burnet/board.c | 27 | ||||
| -rw-r--r-- | board/burnet/gpio.inc | 5 |
2 files changed, 19 insertions, 13 deletions
diff --git a/board/burnet/board.c b/board/burnet/board.c index c55e1d8132..705170abfd 100644 --- a/board/burnet/board.c +++ b/board/burnet/board.c @@ -243,17 +243,24 @@ void bc12_interrupt(enum gpio_signal signal) #ifndef VARIANT_KUKUI_NO_SENSORS static void board_spi_enable(void) { - cputs(CC_ACCEL, "board_spi_enable"); - gpio_config_module(MODULE_SPI_MASTER, 1); + /* + * Pin mux spi peripheral away from emmc, since RO might have + * left them there. + */ + gpio_config_module(MODULE_SPI_FLASH, 0); - /* Enable clocks to SPI2 module */ + /* Enable clocks to SPI2 module. */ STM32_RCC_APB1ENR |= STM32_RCC_PB1_SPI2; - /* Reset SPI2 */ + /* Reset SPI2 to clear state left over from the emmc slave. */ STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2; STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2; + /* Reinitialize spi peripheral. */ spi_enable(CONFIG_SPI_ACCEL_PORT, 1); + + /* Pin mux spi peripheral toward the sensor. */ + gpio_config_module(MODULE_SPI_MASTER, 1); } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_spi_enable, @@ -261,14 +268,14 @@ DECLARE_HOOK(HOOK_CHIPSET_STARTUP, static void board_spi_disable(void) { - spi_enable(CONFIG_SPI_ACCEL_PORT, 0); - - /* Disable clocks to SPI2 module */ - STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; - - gpio_config_module(MODULE_SPI_MASTER, 0); + /* 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); + + /* Disable spi peripheral and clocks. */ + spi_enable(CONFIG_SPI_ACCEL_PORT, 0); + STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2; } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_spi_disable, diff --git a/board/burnet/gpio.inc b/board/burnet/gpio.inc index e7d9c2006b..a08ef74c3c 100644 --- a/board/burnet/gpio.inc +++ b/board/burnet/gpio.inc @@ -111,11 +111,10 @@ ALTERNATE(PIN_MASK(B, 0x0038), 0, MODULE_SPI, 0) ALTERNATE(PIN_MASK(A, 0x8000), 0, MODULE_SPI, 0) /* SPI2 */ -#ifdef VARIANT_KUKUI_NO_SENSORS +/* Shared between slave for emmc and master for bmi160 */ +/* They're mutually exclusive with gpio_config_module. */ /* EMMC SPI SLAVE: PB13/14/15 */ ALTERNATE(PIN_MASK(B, 0xE000), 0, MODULE_SPI_FLASH, 0) -#else /* 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) -#endif /* VARIANT_KUKUI_NO_SENSORS */ |