From dbada69697be895fffe1b7ded21d80db1d01cf9a Mon Sep 17 00:00:00 2001 From: tim Date: Wed, 20 Nov 2019 16:05:39 +0800 Subject: it83xx/spi_master: correct the module ID The module ID in alternate function setting for spi master should be corrected as MODULE_SPI_MASTER. BUG=none BRANCH=none TEST=make buildall -j Change-Id: Ib52b09a5f1e0c496374d4ed2f3a222dab9af2eb0 Signed-off-by: tim Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1868133 Reviewed-by: Jett Rink --- board/it83xx_evb/gpio.inc | 8 ++++---- chip/it83xx/spi_master.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/it83xx_evb/gpio.inc b/board/it83xx_evb/gpio.inc index 45c914c983..1333abe453 100644 --- a/board/it83xx_evb/gpio.inc +++ b/board/it83xx_evb/gpio.inc @@ -70,10 +70,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, 0) /* SSCK of SPI */ -ALTERNATE(PIN_MASK(C, 0x28), 3, MODULE_SPI, 0) /* SMOSI/SMISO of SPI */ -ALTERNATE(PIN_MASK(G, 0x01), 3, MODULE_SPI, 0) /* SSCE1# of SPI */ -ALTERNATE(PIN_MASK(G, 0x04), 3, MODULE_SPI, 0) /* SSCE0# of SPI */ +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, 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/chip/it83xx/spi_master.c b/chip/it83xx/spi_master.c index 1337f7ccac..23cea9d2ab 100644 --- a/chip/it83xx/spi_master.c +++ b/chip/it83xx/spi_master.c @@ -90,14 +90,14 @@ int spi_enable(int port, int enable) else IT83XX_GPIO_GRC1 |= 0x10; - gpio_config_module(MODULE_SPI, 1); + gpio_config_module(MODULE_SPI_MASTER, 1); } else { if (port == SSPI_CH_CS1) IT83XX_GPIO_GRC1 &= ~0x20; else IT83XX_GPIO_GRC1 &= ~0x10; - gpio_config_module(MODULE_SPI, 0); + gpio_config_module(MODULE_SPI_MASTER, 0); } return EC_SUCCESS; -- cgit v1.2.1