From ad32e3b543dac40103960cdf64935121bda31d61 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Mon, 1 Oct 2018 17:08:52 -0500 Subject: [PATCH] drivers: boards: Merge HAS_DTS_SPI_PINS with HAS_DTS_SPI Every board that uses dts-enabled spi drivers has a board-level dts, so there is no need to have separate configs HAS_DTS_SPI_PINS and HAS_DTS_SPI. Signed-off-by: Maureen Helm --- boards/arm/96b_carbon/Kconfig.board | 1 - boards/arm/disco_l475_iot1/Kconfig.board | 1 - boards/arm/frdm_k64f/Kconfig.board | 1 - boards/arm/usb_kw24d512/Kconfig.board | 1 - drivers/bluetooth/hci/Kconfig | 4 ++-- drivers/ieee802154/Kconfig.mcr20a | 6 +----- drivers/sensor/adxl372/Kconfig | 6 +----- drivers/sensor/lsm6dsl/Kconfig | 6 +----- dts/Kconfig | 7 ------- 9 files changed, 5 insertions(+), 28 deletions(-) diff --git a/boards/arm/96b_carbon/Kconfig.board b/boards/arm/96b_carbon/Kconfig.board index 7d172b0d51b..001cad07368 100644 --- a/boards/arm/96b_carbon/Kconfig.board +++ b/boards/arm/96b_carbon/Kconfig.board @@ -8,4 +8,3 @@ config BOARD_96B_CARBON bool "96Boards Carbon (STM32F401)" depends on SOC_STM32F401XE - select HAS_DTS_SPI_PINS diff --git a/boards/arm/disco_l475_iot1/Kconfig.board b/boards/arm/disco_l475_iot1/Kconfig.board index d632a9a883c..0d9f243e035 100644 --- a/boards/arm/disco_l475_iot1/Kconfig.board +++ b/boards/arm/disco_l475_iot1/Kconfig.board @@ -8,4 +8,3 @@ config BOARD_DISCO_L475_IOT1 bool "Discovery IoT L475 Development Board" depends on SOC_STM32L475XG - select HAS_DTS_SPI_PINS diff --git a/boards/arm/frdm_k64f/Kconfig.board b/boards/arm/frdm_k64f/Kconfig.board index 0f34e72ee9a..95fa34d14df 100644 --- a/boards/arm/frdm_k64f/Kconfig.board +++ b/boards/arm/frdm_k64f/Kconfig.board @@ -3,4 +3,3 @@ config BOARD_FRDM_K64F bool "Freescale FRDM-K64F" depends on SOC_SERIES_KINETIS_K6X select SOC_PART_NUMBER_MK64FN1M0VLL12 - select HAS_DTS_SPI_PINS diff --git a/boards/arm/usb_kw24d512/Kconfig.board b/boards/arm/usb_kw24d512/Kconfig.board index ba7e9450bc2..63b899c853b 100644 --- a/boards/arm/usb_kw24d512/Kconfig.board +++ b/boards/arm/usb_kw24d512/Kconfig.board @@ -9,4 +9,3 @@ config BOARD_USB_KW24D512 bool "NXP USB-KW24D512" depends on SOC_SERIES_KINETIS_KWX select SOC_PART_NUMBER_MKW24D512VHA5 - select HAS_DTS_SPI_PINS diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig index 5ed116d41a5..4bfa24f8a5d 100644 --- a/drivers/bluetooth/hci/Kconfig +++ b/drivers/bluetooth/hci/Kconfig @@ -97,7 +97,7 @@ config BT_SPI_BLUENRG Enable support for devices compatible with the BlueNRG Bluetooth Stack. Current driver supports: ST BLUENRG-MS. -if !HAS_DTS_SPI_PINS +if !HAS_DTS_SPI config BT_SPI_CHIP_SELECT_DEV_NAME string "Chip Select (CS) line driver name" @@ -135,7 +135,7 @@ config BT_SPI_RESET_PIN help This option specifies the Reset line number on the SPI device -endif # !HAS_DTS_SPI_PINS +endif # !HAS_DTS_SPI config BT_SPI_MAX_CLK_FREQ int "Maximum clock frequency for the HCI SPI interface" diff --git a/drivers/ieee802154/Kconfig.mcr20a b/drivers/ieee802154/Kconfig.mcr20a index 83e064d360f..44efb5d9652 100644 --- a/drivers/ieee802154/Kconfig.mcr20a +++ b/drivers/ieee802154/Kconfig.mcr20a @@ -42,16 +42,12 @@ config IEEE802154_MCR20A_SPI_SLAVE This option sets the SPI slave number SPI controller has to switch to when dealing with MCR20A chip. -endif # !HAS_DTS_SPI - config IEEE802154_MCR20A_GPIO_SPI_CS bool "Manage SPI CS through a GPIO pin" help This option is useful if one needs to manage SPI CS through a GPIO pin to by-pass the SPI controller's CS logic. -if !HAS_DTS_SPI_PINS - config IEEE802154_MCR20A_GPIO_SPI_CS_DRV_NAME string "GPIO driver's name to use to drive SPI CS through" depends on IEEE802154_MCR20A_GPIO_SPI_CS @@ -67,7 +63,7 @@ config IEEE802154_MCR20A_GPIO_SPI_CS_PIN This option is mandatory to set which GPIO pin to use in order to actually emulate the SPI CS. -endif # !HAS_DTS_SPI_PINS +endif # !HAS_DTS_SPI if !HAS_DTS_GPIO diff --git a/drivers/sensor/adxl372/Kconfig b/drivers/sensor/adxl372/Kconfig index eda25cea474..f1329625d86 100644 --- a/drivers/sensor/adxl372/Kconfig +++ b/drivers/sensor/adxl372/Kconfig @@ -93,10 +93,6 @@ config ADXL372_SPI_BUS_FREQ This is the maximum supported SPI bus frequency. The chip supports a frequency up to 10MHz. -endif # !HAS_DTS_SPI - -if !HAS_DTS_SPI_PINS - config ADXL372_SPI_GPIO_CS_DRV_NAME string "GPIO driver's name to use to drive SPI CS through" default "GPIO_0" @@ -113,7 +109,7 @@ config ADXL372_SPI_GPIO_CS_PIN This option is mandatory to set which GPIO pin to use in order to actually emulate the SPI CS. -endif # !HAS_DTS_SPI_PINS +endif # !HAS_DTS_SPI choice prompt "Operating mode" diff --git a/drivers/sensor/lsm6dsl/Kconfig b/drivers/sensor/lsm6dsl/Kconfig index 79abc13e0e0..d874adc4ec0 100644 --- a/drivers/sensor/lsm6dsl/Kconfig +++ b/drivers/sensor/lsm6dsl/Kconfig @@ -83,8 +83,6 @@ config LSM6DSL_SPI_MASTER_DEV_NAME Specify the device name of the spi master device to which LSM6DSL is connected. -endif #HAS_DTS_SPI - config LSM6DSL_SPI_GPIO_CS bool "LSM6DSL SPI CS through a GPIO pin" depends on LSM6DSL_SPI @@ -92,8 +90,6 @@ config LSM6DSL_SPI_GPIO_CS This option is useful if one needs to manage SPI CS through a GPIO pin to by-pass the SPI controller's CS logic. -if !HAS_DTS_SPI_PINS - config LSM6DSL_SPI_GPIO_CS_DRV_NAME string "GPIO driver's name to use to drive SPI CS through" default "" @@ -110,7 +106,7 @@ config LSM6DSL_SPI_GPIO_CS_PIN This option is mandatory to set which GPIO pin to use in order to actually emulate the SPI CS. -endif # !HAS_DTS_SPI_PINS +endif # !HAS_DTS_SPI choice LSM6DSL_TRIGGER_MODE prompt "Trigger mode" diff --git a/dts/Kconfig b/dts/Kconfig index e424d298a5e..06de78bcd72 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -32,13 +32,6 @@ config HAS_DTS_SPI This option specifies that the target platform supports device tree configuration for SPI. -config HAS_DTS_SPI_PINS - bool - help - This option specifies that the target platform supports device tree - configuration for pin definition of spi devices, like sensors or - RF modules. - config HAS_DTS_USB bool depends on HAS_DTS