diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-01-06 11:41:02 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-10 06:34:37 +0000 |
| commit | eb813744e390921b3ef799df3e445eae0ee46432 (patch) | |
| tree | 9f74140cbe3b25dd67280eb3e9a8507f63e69b65 /board | |
| parent | 9fcc0a5e3ebcb360b98d543ee2ef7867ae0a36cd (diff) | |
| download | chrome-ec-eb813744e390921b3ef799df3e445eae0ee46432.tar.gz | |
coil: CONFIG_SPI_MASTER->CONFIG_SPI_CONTROLLER
BUG=b:175244613
TEST=make buildall -j
Change-Id: I244ca864dad04f2b4f02bb1be2b482921da2fc88
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2615123
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/cr50/board.h | 8 | ||||
| -rw-r--r-- | board/cr50/gpio.inc | 2 | ||||
| -rw-r--r-- | board/host/board.c | 2 | ||||
| -rw-r--r-- | board/host/board.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/board/cr50/board.h b/board/cr50/board.h index 6e139526b4..e91c228594 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -134,10 +134,10 @@ /* Need to be able to bitbang the EC UART for updates through CCD. */ #define CONFIG_UART_BITBANG -/* Enable SPI Master (SPI) module */ -#define CONFIG_SPI_MASTER -#define CONFIG_SPI_MASTER_NO_CS_GPIOS -#define CONFIG_SPI_MASTER_CONFIGURE_GPIOS +/* Enable SPI controller (SPI) module */ +#define CONFIG_SPI_CONTROLLER +#define CONFIG_SPI_CONTROLLER_NO_CS_GPIOS +#define CONFIG_SPI_CONTROLLER_CONFIGURE_GPIOS #define CONFIG_SPI_FLASH_PORT 0 /* Enable SPI peripheral (SPP) module */ diff --git a/board/cr50/gpio.inc b/board/cr50/gpio.inc index e8849797d2..6b8b563314 100644 --- a/board/cr50/gpio.inc +++ b/board/cr50/gpio.inc @@ -310,7 +310,7 @@ PINMUX(GPIO(DETECT_SERVO), B5, DIO_INPUT) * DIOA12 = SPS_CS_L (input) * The digital inputs are enabled in spp.c * - * If CONFIG_SPI_MASTER is defined, these pads are used: + * If CONFIG_SPI_CONTROLLER is defined, these pads are used: * DIOA4 = SPI_MOSI (output) * DIOA8 = SPI_CLK (output) * DIOA11 = SPI_MISO (input) diff --git a/board/host/board.c b/board/host/board.c index 2ff24c7f2d..c531e00ec6 100644 --- a/board/host/board.c +++ b/board/host/board.c @@ -59,7 +59,7 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); #endif -#ifdef CONFIG_SPI_MASTER +#ifdef CONFIG_SPI_CONTROLLER /* SPI devices */ const struct spi_device_t spi_devices[] = { }; diff --git a/board/host/board.h b/board/host/board.h index e104872a14..c42d0e0536 100644 --- a/board/host/board.h +++ b/board/host/board.h @@ -74,7 +74,7 @@ enum { #define PD_MIN_POWER_MW 7500 /* Configuration for fake Fingerprint Sensor */ -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_FP_PORT 1 /* SPI1: third master config */ /* UART indexes (use define rather than enum to expand them) */ |