diff options
-rw-r--r-- | baseboard/ite_evb/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/kukui/baseboard.h | 2 | ||||
-rw-r--r-- | board/c2d2/board.h | 2 | ||||
-rw-r--r-- | board/discovery-stm32f072/board.h | 2 | ||||
-rw-r--r-- | board/elm/board.h | 2 | ||||
-rw-r--r-- | board/flapjack/board.h | 2 | ||||
-rw-r--r-- | board/hammer/board.h | 2 | ||||
-rw-r--r-- | board/hatch_fp/board.h | 2 | ||||
-rw-r--r-- | board/host/board.c | 2 | ||||
-rw-r--r-- | board/host/board.h | 2 | ||||
-rw-r--r-- | board/it8xxx2_pdevb/board.h | 2 | ||||
-rw-r--r-- | board/nocturne_fp/board.h | 2 | ||||
-rw-r--r-- | board/nucleo-dartmonkey/board.h | 2 | ||||
-rw-r--r-- | board/oak/board.h | 2 | ||||
-rw-r--r-- | board/rainier/board.h | 2 | ||||
-rw-r--r-- | board/scarlet/board.h | 2 | ||||
-rw-r--r-- | board/servo_micro/board.h | 2 | ||||
-rw-r--r-- | chip/it83xx/build.mk | 2 | ||||
-rw-r--r-- | chip/stm32/build.mk | 2 | ||||
-rw-r--r-- | include/config.h | 4 | ||||
-rw-r--r-- | util/config_allowed.txt | 1 |
21 files changed, 22 insertions, 21 deletions
diff --git a/baseboard/ite_evb/baseboard.h b/baseboard/ite_evb/baseboard.h index 1d28a15312..dfe289e3a6 100644 --- a/baseboard/ite_evb/baseboard.h +++ b/baseboard/ite_evb/baseboard.h @@ -27,7 +27,7 @@ #define CONFIG_POWER_BUTTON #define CONFIG_PWM /* Use CS0 of SSPI */ -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_FLASH_PORT 0 #define CONFIG_UART_HOST #define CONFIG_HOSTCMD_LPC diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h index 83c574eb60..9b16c9d5e6 100644 --- a/baseboard/kukui/baseboard.h +++ b/baseboard/kukui/baseboard.h @@ -253,7 +253,7 @@ #define CPU_CLOCK 48000000 #undef CONFIG_HIBERNATE -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_STM_HWTIMER32 #define CONFIG_WATCHDOG_HELP #undef CONFIG_UART_CONSOLE diff --git a/board/c2d2/board.h b/board/c2d2/board.h index d3a8a35bdb..a8095ece4d 100644 --- a/board/c2d2/board.h +++ b/board/c2d2/board.h @@ -72,7 +72,7 @@ /* Enable control of SPI over USB */ #define CONFIG_USB_SPI -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_FLASH_PORT 0 /* SPI2 is 0th in stm's SPI_REGS var */ /* Enable control of I2C over USB */ diff --git a/board/discovery-stm32f072/board.h b/board/discovery-stm32f072/board.h index ba5894db56..d3f51f6691 100644 --- a/board/discovery-stm32f072/board.h +++ b/board/discovery-stm32f072/board.h @@ -50,7 +50,7 @@ #define CONFIG_USB_GPIO /* Enable control of SPI over USB */ -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_FLASH_PORT 0 /* First SPI master port */ diff --git a/board/elm/board.h b/board/elm/board.h index 37d8854477..871075b628 100644 --- a/board/elm/board.h +++ b/board/elm/board.h @@ -69,7 +69,7 @@ #define CONFIG_POWER_COMMON #define CONFIG_USB_CHARGER #define CONFIG_SPI -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_STM_HWTIMER32 #define CONFIG_VBOOT_HASH #undef CONFIG_WATCHDOG_HELP diff --git a/board/flapjack/board.h b/board/flapjack/board.h index be9ec8b9b4..43c4afe72f 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -26,7 +26,7 @@ #define CONFIG_LOW_POWER_IDLE #define CONFIG_POWER_COMMON #define CONFIG_SPI -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_STM_HWTIMER32 #define CONFIG_SWITCH #define CONFIG_WATCHDOG_HELP diff --git a/board/hammer/board.h b/board/hammer/board.h index 642fe908d4..4a16983b54 100644 --- a/board/hammer/board.h +++ b/board/hammer/board.h @@ -236,7 +236,7 @@ #ifdef HAS_SPI_TOUCHPAD /* Enable control of SPI over USB */ #define CONFIG_USB_SPI -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_HALFDUPLEX #define CONFIG_STM32_SPI1_MASTER #define CONFIG_SPI_TOUCHPAD_PORT 0 diff --git a/board/hatch_fp/board.h b/board/hatch_fp/board.h index ea9df71257..fd48157478 100644 --- a/board/hatch_fp/board.h +++ b/board/hatch_fp/board.h @@ -188,7 +188,7 @@ *-------------------------------------------------------------------------*/ /* SPI configuration for the fingerprint sensor */ -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_FP_PORT 0 /* SPI2: first master config */ #define CONFIG_FINGERPRINT_MCU #ifdef SECTION_IS_RW diff --git a/board/host/board.c b/board/host/board.c index 25abd9a0ad..2253475dde 100644 --- a/board/host/board.c +++ b/board/host/board.c @@ -75,7 +75,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[] = { /* Fingerprint sensor (SCLK at 4Mhz) */ diff --git a/board/host/board.h b/board/host/board.h index 30c2bb8e29..8f34a22b4d 100644 --- a/board/host/board.h +++ b/board/host/board.h @@ -81,7 +81,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 */ #define CONFIG_RNG diff --git a/board/it8xxx2_pdevb/board.h b/board/it8xxx2_pdevb/board.h index 44aa02cd7d..3d92745f0e 100644 --- a/board/it8xxx2_pdevb/board.h +++ b/board/it8xxx2_pdevb/board.h @@ -29,7 +29,7 @@ #undef CONFIG_PECI_TJMAX #undef CONFIG_POWER_BUTTON #undef CONFIG_PWM -#undef CONFIG_SPI_MASTER +#undef CONFIG_SPI_CONTROLLER #undef CONFIG_SPI_FLASH_PORT #undef CONFIG_UART_HOST #undef CONFIG_HOSTCMD_LPC diff --git a/board/nocturne_fp/board.h b/board/nocturne_fp/board.h index ece1b64258..c30b4b76e0 100644 --- a/board/nocturne_fp/board.h +++ b/board/nocturne_fp/board.h @@ -111,7 +111,7 @@ #define CONFIG_WP_ACTIVE_HIGH /* SPI configuration for the fingerprint sensor */ -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_FP_PORT 2 /* SPI4: third master config */ #define CONFIG_FINGERPRINT_MCU diff --git a/board/nucleo-dartmonkey/board.h b/board/nucleo-dartmonkey/board.h index 6466b6280e..9e220db7dc 100644 --- a/board/nucleo-dartmonkey/board.h +++ b/board/nucleo-dartmonkey/board.h @@ -32,7 +32,7 @@ #define CONFIG_ROLLBACK_SECRET_SIZE 32 /* SPI configuration for the fingerprint sensor */ -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_FP_PORT 2 /* SPI4: third master config */ #define CONFIG_FINGERPRINT_MCU diff --git a/board/oak/board.h b/board/oak/board.h index e0e24029db..63e51277ab 100644 --- a/board/oak/board.h +++ b/board/oak/board.h @@ -102,7 +102,7 @@ #define CONFIG_USB_PD_TRY_SRC #define CONFIG_USB_PD_VBUS_DETECT_TCPC #define CONFIG_SPI -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_STM_HWTIMER32 #define CONFIG_VBOOT_HASH #undef CONFIG_WATCHDOG_HELP diff --git a/board/rainier/board.h b/board/rainier/board.h index 01a9950af9..372ab53616 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -21,7 +21,7 @@ #define CONFIG_LOW_POWER_IDLE #define CONFIG_POWER_COMMON #define CONFIG_SPI -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_STM_HWTIMER32 /* Source RTCCLK from external 32.768kHz source on PC15/OSC32_IN. */ #define CONFIG_STM32_CLOCK_LSE diff --git a/board/scarlet/board.h b/board/scarlet/board.h index 318ec0911d..bd14487e63 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -26,7 +26,7 @@ #define CONFIG_LOW_POWER_IDLE_LIMITED #define CONFIG_POWER_COMMON #define CONFIG_SPI -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_STM_HWTIMER32 /* Source RTCCLK from external 32.768kHz source on PC15/OSC32_IN. */ #define CONFIG_STM32_CLOCK_LSE diff --git a/board/servo_micro/board.h b/board/servo_micro/board.h index c597861242..306bc0e5d7 100644 --- a/board/servo_micro/board.h +++ b/board/servo_micro/board.h @@ -75,7 +75,7 @@ /* Enable control of SPI over USB */ #define CONFIG_USB_SPI -#define CONFIG_SPI_MASTER +#define CONFIG_SPI_CONTROLLER #define CONFIG_SPI_FLASH_PORT 0 /* First SPI master port */ /* This is not actually an EC so disable some features. */ diff --git a/chip/it83xx/build.mk b/chip/it83xx/build.mk index 2eac0cdb85..bbff9f009b 100644 --- a/chip/it83xx/build.mk +++ b/chip/it83xx/build.mk @@ -30,7 +30,7 @@ chip-$(CONFIG_ADC)+=adc.o chip-$(CONFIG_DAC)+=dac.o chip-$(CONFIG_HOSTCMD_X86)+=lpc.o ec2i.o chip-$(CONFIG_HOSTCMD_ESPI)+=espi.o -chip-$(CONFIG_SPI_MASTER)+=spi_master.o +chip-$(CONFIG_SPI_CONTROLLER)+=spi_master.o chip-$(CONFIG_SPI)+=spi.o chip-$(CONFIG_PECI)+=peci.o ifndef CONFIG_KEYBOARD_NOT_RAW diff --git a/chip/stm32/build.mk b/chip/stm32/build.mk index f2d5720961..46f2aa41a3 100644 --- a/chip/stm32/build.mk +++ b/chip/stm32/build.mk @@ -45,7 +45,7 @@ ifeq ($(CHIP_FAMILY),$(filter $(CHIP_FAMILY),stm32f0 stm32f3 stm32f4)) chip-y+=clock-f.o endif chip-$(CONFIG_SPI)+=spi.o -chip-$(CONFIG_SPI_MASTER)+=spi_master$(SPI_TYPE).o +chip-$(CONFIG_SPI_CONTROLLER)+=spi_master$(SPI_TYPE).o chip-$(CONFIG_COMMON_GPIO)+=gpio.o gpio-$(CHIP_FAMILY).o chip-$(CONFIG_COMMON_TIMER)+=hwtimer$(TIMER_TYPE).o chip-$(CONFIG_I2C)+=i2c-$(CHIP_FAMILY).o diff --git a/include/config.h b/include/config.h index 4c5e6bfa9b..d24483f3c4 100644 --- a/include/config.h +++ b/include/config.h @@ -3644,8 +3644,8 @@ */ #undef CONFIG_SPI_NOR_SMART_ERASE -/* SPI master feature */ -#undef CONFIG_SPI_MASTER +/* SPI controller feature */ +#undef CONFIG_SPI_CONTROLLER /* SPI master halfduplex/3-wire mode */ #undef CONFIG_SPI_HALFDUPLEX diff --git a/util/config_allowed.txt b/util/config_allowed.txt index 57a80446d7..98d66d786a 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -858,6 +858,7 @@ CONFIG_SOFTWARE_CTZ CONFIG_SOMETHING CONFIG_SPI CONFIG_SPI_ACCEL_PORT +CONFIG_SPI_CONTROLLER CONFIG_SPI_CS_GPIO CONFIG_SPI_FLASH CONFIG_SPI_FLASH_GD25LQ40 |