From eeb4411de772c364ffd6e0e39135a67ec72e3b00 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Sun, 30 Sep 2018 09:57:08 -0500 Subject: [PATCH] drivers: boards: Merge HAS_DTS_GPIO_DEVICE with HAS_DTS_GPIO Every board that uses dts-enabled gpio drivers has a board-level dts, so there is no need to have separate configs HAS_DTS_GPIO_DEVICE and HAS_DTS_GPIO. Signed-off-by: Maureen Helm --- boards/arm/96b_argonkey/Kconfig.board | 1 - boards/arm/frdm_k64f/Kconfig.board | 1 - boards/arm/frdm_kw41z/Kconfig.board | 1 - boards/arm/hexiwear_k64/Kconfig.board | 1 - boards/arm/reel_board/Kconfig.board | 1 - boards/arm/usb_kw24d512/Kconfig.board | 1 - boards/arm/warp7_m4/Kconfig.board | 1 - drivers/ieee802154/Kconfig.mcr20a | 4 ++-- drivers/sensor/adt7420/Kconfig | 4 ++-- drivers/sensor/adxl372/Kconfig | 4 ++-- drivers/sensor/apds9960/Kconfig | 4 ++-- drivers/sensor/fxas21002/Kconfig | 2 +- drivers/sensor/fxos8700/Kconfig | 2 +- drivers/sensor/hdc1008/Kconfig | 4 ++-- drivers/sensor/lsm6dsl/Kconfig | 4 ++-- dts/Kconfig | 7 ------- .../arduino_101/environmental_sensing/sensor/dts.fixup | 4 ++-- 17 files changed, 16 insertions(+), 30 deletions(-) diff --git a/boards/arm/96b_argonkey/Kconfig.board b/boards/arm/96b_argonkey/Kconfig.board index 417051a5384..e9daf009ef3 100644 --- a/boards/arm/96b_argonkey/Kconfig.board +++ b/boards/arm/96b_argonkey/Kconfig.board @@ -7,4 +7,3 @@ config BOARD_96B_ARGONKEY bool "96Boards Argonkey" depends on SOC_STM32F412CG - select HAS_DTS_GPIO_DEVICE diff --git a/boards/arm/frdm_k64f/Kconfig.board b/boards/arm/frdm_k64f/Kconfig.board index 3474ef8dfbb..0f34e72ee9a 100644 --- a/boards/arm/frdm_k64f/Kconfig.board +++ b/boards/arm/frdm_k64f/Kconfig.board @@ -3,5 +3,4 @@ config BOARD_FRDM_K64F bool "Freescale FRDM-K64F" depends on SOC_SERIES_KINETIS_K6X select SOC_PART_NUMBER_MK64FN1M0VLL12 - select HAS_DTS_GPIO_DEVICE select HAS_DTS_SPI_PINS diff --git a/boards/arm/frdm_kw41z/Kconfig.board b/boards/arm/frdm_kw41z/Kconfig.board index 06b868171c8..195a1dc8cf0 100644 --- a/boards/arm/frdm_kw41z/Kconfig.board +++ b/boards/arm/frdm_kw41z/Kconfig.board @@ -9,4 +9,3 @@ config BOARD_FRDM_KW41Z bool "NXP FRDM-KW41Z" depends on SOC_SERIES_KINETIS_KWX select SOC_PART_NUMBER_MKW41Z512VHT4 - select HAS_DTS_GPIO_DEVICE diff --git a/boards/arm/hexiwear_k64/Kconfig.board b/boards/arm/hexiwear_k64/Kconfig.board index 087a92de76c..3108b024dd5 100644 --- a/boards/arm/hexiwear_k64/Kconfig.board +++ b/boards/arm/hexiwear_k64/Kconfig.board @@ -9,4 +9,3 @@ config BOARD_HEXIWEAR_K64 bool "NXP Hexiwear K64" depends on SOC_SERIES_KINETIS_K6X select SOC_PART_NUMBER_MK64FN1M0VDC12 - select HAS_DTS_GPIO_DEVICE diff --git a/boards/arm/reel_board/Kconfig.board b/boards/arm/reel_board/Kconfig.board index e0728af1b76..ed57984ef6d 100644 --- a/boards/arm/reel_board/Kconfig.board +++ b/boards/arm/reel_board/Kconfig.board @@ -7,4 +7,3 @@ config BOARD_REEL_BOARD bool "reel Board" depends on SOC_NRF52840_QIAA - select HAS_DTS_GPIO_DEVICE diff --git a/boards/arm/usb_kw24d512/Kconfig.board b/boards/arm/usb_kw24d512/Kconfig.board index 43bf1fb2f5f..ba7e9450bc2 100644 --- a/boards/arm/usb_kw24d512/Kconfig.board +++ b/boards/arm/usb_kw24d512/Kconfig.board @@ -9,5 +9,4 @@ config BOARD_USB_KW24D512 bool "NXP USB-KW24D512" depends on SOC_SERIES_KINETIS_KWX select SOC_PART_NUMBER_MKW24D512VHA5 - select HAS_DTS_GPIO_DEVICE select HAS_DTS_SPI_PINS diff --git a/boards/arm/warp7_m4/Kconfig.board b/boards/arm/warp7_m4/Kconfig.board index 6804c6da9ef..05b4a8c05c2 100644 --- a/boards/arm/warp7_m4/Kconfig.board +++ b/boards/arm/warp7_m4/Kconfig.board @@ -10,4 +10,3 @@ config BOARD_WARP7_M4 depends on SOC_SERIES_IMX7_M4 select SOC_PART_NUMBER_MCIMX7S3DVK08SA select HAS_DTS_GPIO - select HAS_DTS_GPIO_DEVICE diff --git a/drivers/ieee802154/Kconfig.mcr20a b/drivers/ieee802154/Kconfig.mcr20a index de81427d9d6..83e064d360f 100644 --- a/drivers/ieee802154/Kconfig.mcr20a +++ b/drivers/ieee802154/Kconfig.mcr20a @@ -69,7 +69,7 @@ config IEEE802154_MCR20A_GPIO_SPI_CS_PIN endif # !HAS_DTS_SPI_PINS -if !HAS_DTS_GPIO_DEVICE +if !HAS_DTS_GPIO config MCR20A_GPIO_IRQ_B_NAME string "GPIO device used for IRQ_B output of MCR20A" @@ -85,7 +85,7 @@ config MCR20A_GPIO_RESET_PIN int "GPIO pin connected to RESET input of MCR20A" default 2 -endif # !HAS_DTS_GPIO_DEVICE +endif # !HAS_DTS_GPIO config MCR20A_IS_PART_OF_KW2XD_SIP bool "MCR20A device is part of KW2xD SiP" diff --git a/drivers/sensor/adt7420/Kconfig b/drivers/sensor/adt7420/Kconfig index 7702d292232..3fc9323e647 100644 --- a/drivers/sensor/adt7420/Kconfig +++ b/drivers/sensor/adt7420/Kconfig @@ -83,7 +83,7 @@ endchoice config ADT7420_TRIGGER bool -if !HAS_DTS_GPIO_DEVICE +if !HAS_DTS_GPIO config ADT7420_GPIO_DEV_NAME string "GPIO device" @@ -101,7 +101,7 @@ config ADT7420_GPIO_PIN_NUM The GPIO pin number receiving the interrupt signal from the ADT7420 sensor. -endif # !HAS_DTS_GPIO_DEVICE +endif # !HAS_DTS_GPIO config ADT7420_THREAD_PRIORITY int "Thread priority" diff --git a/drivers/sensor/adxl372/Kconfig b/drivers/sensor/adxl372/Kconfig index a8b50a943ed..eda25cea474 100644 --- a/drivers/sensor/adxl372/Kconfig +++ b/drivers/sensor/adxl372/Kconfig @@ -293,7 +293,7 @@ endchoice config ADXL372_TRIGGER bool -if !HAS_DTS_GPIO_DEVICE +if !HAS_DTS_GPIO config ADXL372_GPIO_DEV_NAME string "GPIO device" @@ -311,7 +311,7 @@ config ADXL372_GPIO_PIN_NUM The GPIO pin number receiving the interrupt signal from the ADXL372 sensor. -endif # !HAS_DTS_GPIO_DEVICE +endif # !HAS_DTS_GPIO config ADXL372_THREAD_PRIORITY int "Thread priority" diff --git a/drivers/sensor/apds9960/Kconfig b/drivers/sensor/apds9960/Kconfig index ddd10f10839..59aee6969c5 100644 --- a/drivers/sensor/apds9960/Kconfig +++ b/drivers/sensor/apds9960/Kconfig @@ -30,7 +30,7 @@ config APDS9960_DRV_NAME endif # !HAS_DTS_I2C -if !HAS_DTS_GPIO_DEVICE +if !HAS_DTS_GPIO config APDS9960_GPIO_DEV_NAME string "GPIO device" @@ -45,7 +45,7 @@ config APDS9960_GPIO_PIN_NUM The GPIO pin number receiving the interrupt signal from the APDS9960 sensor. -endif # !HAS_DTS_GPIO_DEVICE +endif # !HAS_DTS_GPIO choice prompt "Trigger mode" diff --git a/drivers/sensor/fxas21002/Kconfig b/drivers/sensor/fxas21002/Kconfig index e6c35a78f7b..63957757ccf 100644 --- a/drivers/sensor/fxas21002/Kconfig +++ b/drivers/sensor/fxas21002/Kconfig @@ -90,7 +90,7 @@ config FXAS21002_TRIGGER if FXAS21002_TRIGGER -if !HAS_DTS_GPIO_DEVICE +if !HAS_DTS_GPIO config FXAS21002_GPIO_NAME string "GPIO device name" diff --git a/drivers/sensor/fxos8700/Kconfig b/drivers/sensor/fxos8700/Kconfig index ea4be865348..4fbb409564c 100644 --- a/drivers/sensor/fxos8700/Kconfig +++ b/drivers/sensor/fxos8700/Kconfig @@ -100,7 +100,7 @@ endchoice config FXOS8700_TRIGGER bool -if !HAS_DTS_GPIO_DEVICE +if !HAS_DTS_GPIO config FXOS8700_GPIO_NAME string "GPIO device name" diff --git a/drivers/sensor/hdc1008/Kconfig b/drivers/sensor/hdc1008/Kconfig index 042b11072bc..ba0b719f212 100644 --- a/drivers/sensor/hdc1008/Kconfig +++ b/drivers/sensor/hdc1008/Kconfig @@ -40,7 +40,7 @@ config HDC1008_I2C_MASTER_DEV_NAME endif # !HAS_DTS_I2C -if !HAS_DTS_GPIO_DEVICE +if !HAS_DTS_GPIO config HDC1008_GPIO_DEV_NAME string "GPIO device" @@ -56,6 +56,6 @@ config HDC1008_GPIO_PIN_NUM The number of the GPIO on which the data-ready signal from the HDC1008 chip will be received. -endif # !HAS_DTS_GPIO_DEVICE +endif # !HAS_DTS_GPIO endif # HDC1008 diff --git a/drivers/sensor/lsm6dsl/Kconfig b/drivers/sensor/lsm6dsl/Kconfig index a22c6d29b4a..79abc13e0e0 100644 --- a/drivers/sensor/lsm6dsl/Kconfig +++ b/drivers/sensor/lsm6dsl/Kconfig @@ -135,7 +135,7 @@ endchoice config LSM6DSL_TRIGGER bool -if !HAS_DTS_GPIO_DEVICE +if !HAS_DTS_GPIO config LSM6DSL_GPIO_DEV_NAME string "GPIO device" @@ -151,7 +151,7 @@ config LSM6DSL_GPIO_PIN_NUM The number of the GPIO on which the interrupt signal from the LSM6DSL chip will be received. -endif # HAS_DTS_GPIO_DEVICE +endif # HAS_DTS_GPIO config LSM6DSL_THREAD_PRIORITY int "Thread priority" diff --git a/dts/Kconfig b/dts/Kconfig index 50248c395f8..e424d298a5e 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -18,13 +18,6 @@ config HAS_DTS_GPIO This option specifies that the target platform supports device tree configuration for GPIO. -config HAS_DTS_GPIO_DEVICE - bool - depends on HAS_DTS_GPIO - help - This option specifies that the target platform supports device tree - configuration for GPIO on the driver/consumer side. - config HAS_DTS_I2C bool depends on HAS_DTS diff --git a/samples/boards/arduino_101/environmental_sensing/sensor/dts.fixup b/samples/boards/arduino_101/environmental_sensing/sensor/dts.fixup index 236e38b4d90..9b9cd0b4fa3 100644 --- a/samples/boards/arduino_101/environmental_sensing/sensor/dts.fixup +++ b/samples/boards/arduino_101/environmental_sensing/sensor/dts.fixup @@ -12,9 +12,9 @@ #endif /* CONFIG_HAS_DTS_I2C */ -#if defined(CONFIG_HAS_DTS_GPIO_DEVICE) +#if defined(CONFIG_HAS_DTS_GPIO) #define CONFIG_HDC1008_GPIO_DEV_NAME INTEL_QMSI_SS_I2C_80012000_TI_HDC1008_40_DRDY_GPIOS_CONTROLLER #define CONFIG_HDC1008_GPIO_PIN_NUM INTEL_QMSI_SS_I2C_80012000_TI_HDC1008_40_DRDY_GPIOS_PIN -#endif /* CONFIG_HAS_DTS_GPIO_DEVICE */ +#endif /* CONFIG_HAS_DTS_GPIO */