michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: boards: Merge HAS_DTS_SPI_DEVICE with HAS_DTS_SPI

Browse source 
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_DEVICE and
HAS_DTS_SPI.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2018-09-29 11:08:22 -05:00 • committed by Kumar Gala
commit 89ccead382
12 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boards/arm/frdm_k64f/Kconfig.board
View file

@ -4,5 +4,4 @@ config BOARD_FRDM_K64F
depends on SOC_SERIES_KINETIS_K6X depends on SOC_SERIES_KINETIS_K6X
select SOC_PART_NUMBER_MK64FN1M0VLL12 select SOC_PART_NUMBER_MK64FN1M0VLL12
select HAS_DTS_GPIO_DEVICE select HAS_DTS_GPIO_DEVICE
select HAS_DTS_SPI_DEVICE
select HAS_DTS_SPI_PINS select HAS_DTS_SPI_PINS

1
boards/arm/frdm_kw41z/Kconfig.board
View file

@ -10,4 +10,3 @@ config BOARD_FRDM_KW41Z
depends on SOC_SERIES_KINETIS_KWX depends on SOC_SERIES_KINETIS_KWX
select SOC_PART_NUMBER_MKW41Z512VHT4 select SOC_PART_NUMBER_MKW41Z512VHT4
select HAS_DTS_GPIO_DEVICE select HAS_DTS_GPIO_DEVICE
select HAS_DTS_SPI_DEVICE

1
boards/arm/hexiwear_k64/Kconfig.board
View file

@ -10,4 +10,3 @@ config BOARD_HEXIWEAR_K64
depends on SOC_SERIES_KINETIS_K6X depends on SOC_SERIES_KINETIS_K6X
select SOC_PART_NUMBER_MK64FN1M0VDC12 select SOC_PART_NUMBER_MK64FN1M0VDC12
select HAS_DTS_GPIO_DEVICE select HAS_DTS_GPIO_DEVICE
select HAS_DTS_SPI_DEVICE

1
boards/arm/usb_kw24d512/Kconfig.board
View file

@ -10,5 +10,4 @@ config BOARD_USB_KW24D512
depends on SOC_SERIES_KINETIS_KWX depends on SOC_SERIES_KINETIS_KWX
select SOC_PART_NUMBER_MKW24D512VHA5 select SOC_PART_NUMBER_MKW24D512VHA5
select HAS_DTS_GPIO_DEVICE select HAS_DTS_GPIO_DEVICE
select HAS_DTS_SPI_DEVICE
select HAS_DTS_SPI_PINS select HAS_DTS_SPI_PINS

4
drivers/bluetooth/hci/Kconfig
View file

@ -75,7 +75,7 @@ endif
config BT_SPI_DEV_NAME config BT_SPI_DEV_NAME
string "Device Name of SPI Device for Bluetooth" string "Device Name of SPI Device for Bluetooth"
default "SPI_0" default "SPI_0"
depends on BT_SPI && !HAS_DTS_SPI_DEVICE depends on BT_SPI && !HAS_DTS_SPI
help help
This option specifies the name of SPI device to be used for Bluetooth. This option specifies the name of SPI device to be used for Bluetooth.
On the controller side, this SPI device is used to encapsulate the On the controller side, this SPI device is used to encapsulate the
@ -140,7 +140,7 @@ endif # !HAS_DTS_SPI_PINS
config BT_SPI_MAX_CLK_FREQ config BT_SPI_MAX_CLK_FREQ
int "Maximum clock frequency for the HCI SPI interface" int "Maximum clock frequency for the HCI SPI interface"
default 5000000 default 5000000
depends on !HAS_DTS_SPI_DEVICE depends on !HAS_DTS_SPI
help help
This option specifies the maximum clock rate the HCI SPI This option specifies the maximum clock rate the HCI SPI
interface is capable of running at. interface is capable of running at.

4
drivers/ieee802154/Kconfig.mcr20a
View file

@ -18,7 +18,7 @@ config IEEE802154_MCR20A_DRV_NAME
help help
This option sets the driver name This option sets the driver name
if !HAS_DTS_SPI_DEVICE if !HAS_DTS_SPI
config IEEE802154_MCR20A_SPI_DRV_NAME config IEEE802154_MCR20A_SPI_DRV_NAME
string "SPI driver's name to use to access MCR20A" string "SPI driver's name to use to access MCR20A"
@ -42,7 +42,7 @@ config IEEE802154_MCR20A_SPI_SLAVE
This option sets the SPI slave number SPI controller has to switch This option sets the SPI slave number SPI controller has to switch
to when dealing with MCR20A chip. to when dealing with MCR20A chip.
endif # !HAS_DTS_SPI_DEVICE endif # !HAS_DTS_SPI
config IEEE802154_MCR20A_GPIO_SPI_CS config IEEE802154_MCR20A_GPIO_SPI_CS
bool "Manage SPI CS through a GPIO pin" bool "Manage SPI CS through a GPIO pin"

4
drivers/sensor/adxl372/Kconfig
View file

@ -55,7 +55,7 @@ config ADXL372_I2C_MASTER_DEV_NAME
endif # !HAS_DTS_I2C endif # !HAS_DTS_I2C
if !HAS_DTS_SPI_DEVICE if !HAS_DTS_SPI
config ADXL372_DEV_NAME config ADXL372_DEV_NAME
string "ADXL372 device name" string "ADXL372 device name"
@ -93,7 +93,7 @@ config ADXL372_SPI_BUS_FREQ
This is the maximum supported SPI bus frequency. The chip supports a This is the maximum supported SPI bus frequency. The chip supports a
frequency up to 10MHz. frequency up to 10MHz.
endif # !HAS_DTS_SPI_DEVICE endif # !HAS_DTS_SPI
if !HAS_DTS_SPI_PINS if !HAS_DTS_SPI_PINS

4
drivers/sensor/lsm6dsl/Kconfig
View file

@ -58,7 +58,7 @@ config LSM6DSL_I2C_MASTER_DEV_NAME
endif #HAS_DTS_I2C endif #HAS_DTS_I2C
if !HAS_DTS_SPI_DEVICE if !HAS_DTS_SPI
config LSM6DSL_SPI_SELECT_SLAVE config LSM6DSL_SPI_SELECT_SLAVE
hex "LSM6DSL SPI slave select pin" hex "LSM6DSL SPI slave select pin"
@ -83,7 +83,7 @@ config LSM6DSL_SPI_MASTER_DEV_NAME
Specify the device name of the spi master device to which LSM6DSL is Specify the device name of the spi master device to which LSM6DSL is
connected. connected.
endif #HAS_DTS_SPI_DEVICE endif #HAS_DTS_SPI
config LSM6DSL_SPI_GPIO_CS config LSM6DSL_SPI_GPIO_CS
bool "LSM6DSL SPI CS through a GPIO pin" bool "LSM6DSL SPI CS through a GPIO pin"

7
dts/Kconfig
View file

@ -39,13 +39,6 @@ config HAS_DTS_SPI
This option specifies that the target platform supports device tree This option specifies that the target platform supports device tree
configuration for SPI. configuration for SPI.
config HAS_DTS_SPI_DEVICE
bool
depends on HAS_DTS_SPI
help
This option specifies that the target platform supports device tree
configuration for spi devices, like sensors or RF modules.
config HAS_DTS_SPI_PINS config HAS_DTS_SPI_PINS
bool bool
help help

4
samples/sensor/adxl372/dts.fixup
View file

@ -10,7 +10,7 @@
#endif /* CONFIG_HAS_DTS_I2C */ #endif /* CONFIG_HAS_DTS_I2C */
#if defined(CONFIG_HAS_DTS_SPI_DEVICE) #if defined(CONFIG_HAS_DTS_SPI)
#ifndef CONFIG_ADXL372_DEV_NAME #ifndef CONFIG_ADXL372_DEV_NAME
#define CONFIG_ADXL372_DEV_NAME "" #define CONFIG_ADXL372_DEV_NAME ""
@ -21,4 +21,4 @@
#define CONFIG_ADXL372_SPI_BUS_FREQ 8000000 #define CONFIG_ADXL372_SPI_BUS_FREQ 8000000
#endif #endif
#endif /* CONFIG_HAS_DTS_SPI_DEVICE */ #endif /* CONFIG_HAS_DTS_SPI */

1
soc/arm/st_stm32/Kconfig
View file

@ -9,7 +9,6 @@ config SOC_FAMILY_STM32
bool bool
# omit prompt to signify a "hidden" option # omit prompt to signify a "hidden" option
select HAS_SEGGER_RTT select HAS_SEGGER_RTT
select HAS_DTS_SPI_DEVICE if SPI
if SOC_FAMILY_STM32 if SOC_FAMILY_STM32

4
tests/drivers/build_all/dts.fixup
View file

@ -107,7 +107,7 @@
#endif /* CONFIG_HAS_DTS_I2C */ #endif /* CONFIG_HAS_DTS_I2C */
#if defined(CONFIG_HAS_DTS_SPI_DEVICE) #if defined(CONFIG_HAS_DTS_SPI)
#ifndef CONFIG_ADXL372_DEV_NAME #ifndef CONFIG_ADXL372_DEV_NAME
#define CONFIG_ADXL372_DEV_NAME "" #define CONFIG_ADXL372_DEV_NAME ""
@ -116,4 +116,4 @@
#define CONFIG_ADXL372_SPI_BUS_FREQ 8000000 #define CONFIG_ADXL372_SPI_BUS_FREQ 8000000
#endif #endif
#endif /* CONFIG_HAS_DTS_SPI_DEVICE */ #endif /* CONFIG_HAS_DTS_SPI */