diff options
author | Nicolas Boichat <drinkcat@chromium.org> | 2018-07-23 07:48:21 +0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-07-23 09:27:23 -0700 |
commit | 83fc351b086a560b21f538828d0eb9fc6d491780 (patch) | |
tree | ed28d4011cbc112a8d20a6c10e6465e88768468f /board | |
parent | fb4b73d341948f46597c7a7ca83a194a755c23b6 (diff) | |
download | chrome-ec-83fc351b086a560b21f538828d0eb9fc6d491780.tar.gz |
kukui: Use MODULE_SPI_FLASH for eMMC emulation pins
Will make it possible to unconfigure eMMC emulation pins after the
AP has booted.
BRANCH=None
BUG=b:110907438
TEST=make BOARD=kukui BOOTBLOCK=bootblock.bin -j => boot
Change-Id: I1289da42472bbbc176f8a29fc2ffcf7f15b9ab18
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1146133
Reviewed-by: Yilun Lin <yllin@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/kukui/emmc.c | 2 | ||||
-rw-r--r-- | board/kukui/gpio.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/kukui/emmc.c b/board/kukui/emmc.c index b7e8265063..9c896640d3 100644 --- a/board/kukui/emmc.c +++ b/board/kukui/emmc.c @@ -187,7 +187,7 @@ static void emmc_init_spi(void) #error "Please define EMMC_SPI_PORT in board.h." #endif clock_wait_bus_cycles(BUS_APB, 1); - gpio_config_module(MODULE_SPI, 1); + gpio_config_module(MODULE_SPI_FLASH, 1); STM32_SPI_EMMC_REGS->cr2 = STM32_SPI_CR2_FRXTH | STM32_SPI_CR2_DATASIZE(8) | diff --git a/board/kukui/gpio.inc b/board/kukui/gpio.inc index 0892785979..edceecff56 100644 --- a/board/kukui/gpio.inc +++ b/board/kukui/gpio.inc @@ -95,7 +95,7 @@ ALTERNATE(PIN_MASK(A, 0x1800), 5, MODULE_I2C, GPIO_ODR_HIGH ) ALTERNATE(PIN_MASK(B, 0x0038), 0, MODULE_SPI, 0) #ifdef SECTION_IS_RO /* SPI SLAVE: PB13/14/15 */ -ALTERNATE(PIN_MASK(B, 0xE000), 0, MODULE_SPI, 0) +ALTERNATE(PIN_MASK(B, 0xE000), 0, MODULE_SPI_FLASH, 0) #endif /* SPI SLAVE CS: PA15 */ ALTERNATE(PIN_MASK(A, 0x8000), 0, MODULE_SPI, 0) |