diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-01-06 11:51:01 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-10 06:34:45 +0000 |
| commit | 26d8175b4845587a3ed30f9c2a7c5a7d37865bcd (patch) | |
| tree | e87f1209b4e53582e819b2b5469c7b44ba8ad5b6 | |
| parent | eb813744e390921b3ef799df3e445eae0ee46432 (diff) | |
| download | chrome-ec-26d8175b4845587a3ed30f9c2a7c5a7d37865bcd.tar.gz | |
coil: rename spi_master to spi_controller
BUG=b:175244613
TEST=make buildall -j
Change-Id: If7b5829294a3d4d8a68042f1a8d449e8e6ef158e
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2615124
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
| -rw-r--r-- | board/cr50/gpio.inc | 2 | ||||
| -rw-r--r-- | chip/g/build.mk | 2 | ||||
| -rw-r--r-- | chip/g/spi_controller.c (renamed from chip/g/spi_master.c) | 0 | ||||
| -rw-r--r-- | chip/g/spi_controller.h (renamed from chip/g/spi_master.h) | 0 | ||||
| -rw-r--r-- | chip/host/build.mk | 2 | ||||
| -rw-r--r-- | chip/host/spi_controller.c (renamed from chip/host/spi_master.c) | 0 |
6 files changed, 3 insertions, 3 deletions
diff --git a/board/cr50/gpio.inc b/board/cr50/gpio.inc index 6b8b563314..887e2f4807 100644 --- a/board/cr50/gpio.inc +++ b/board/cr50/gpio.inc @@ -317,7 +317,7 @@ PINMUX(GPIO(DETECT_SERVO), B5, DIO_INPUT) * DIOA14 = SPI_CS_L (output) * The pads are only connected to the module outputs when SPI is enabled to * avoid interfering with other things on the board. - * Note: Double-check to be sure these are configured in spi_master.c + * Note: Double-check to be sure these are configured in spi_controller.c */ PINMUX(GPIO(SPI_MOSI), A4, DIO_OUTPUT) PINMUX(GPIO(SPI_CLK), A8, DIO_OUTPUT) diff --git a/chip/g/build.mk b/chip/g/build.mk index e9e4d885a5..51721fbf0d 100644 --- a/chip/g/build.mk +++ b/chip/g/build.mk @@ -59,7 +59,7 @@ endif endif chip-$(CONFIG_DCRYPTO)+= dcrypto/x509.o -chip-$(CONFIG_SPI_CONTROLLER)+=spi_master.o +chip-$(CONFIG_SPI_CONTROLLER)+=spi_controller.o chip-y+= jitter.o chip-y+= pmu.o diff --git a/chip/g/spi_master.c b/chip/g/spi_controller.c index 90ad033e46..90ad033e46 100644 --- a/chip/g/spi_master.c +++ b/chip/g/spi_controller.c diff --git a/chip/g/spi_master.h b/chip/g/spi_controller.h index 16af19f562..16af19f562 100644 --- a/chip/g/spi_master.h +++ b/chip/g/spi_controller.h diff --git a/chip/host/build.mk b/chip/host/build.mk index 3b71e676a4..8b7ab0efc2 100644 --- a/chip/host/build.mk +++ b/chip/host/build.mk @@ -9,7 +9,7 @@ CORE:=host chip-y=clock.o flash.o gpio.o i2c.o lpc.o persistence.o reboot.o registers.o \ - spi_master.o system.o trng.o uart.o + spi_controller.o system.o trng.o uart.o ifndef CONFIG_KEYBOARD_NOT_RAW chip-$(HAS_TASK_KEYSCAN)+=keyboard_raw.o endif diff --git a/chip/host/spi_master.c b/chip/host/spi_controller.c index 83bde96163..83bde96163 100644 --- a/chip/host/spi_master.c +++ b/chip/host/spi_controller.c |