From 91012bc3f93dbb4744a98ed08cf61a6ed9b5980f Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Thu, 20 Jan 2022 09:12:16 +0100 Subject: [PATCH] drivers/ft5x06: remove unnecessary pseudomodules --- boards/stm32f723e-disco/Kconfig | 2 +- boards/stm32f723e-disco/Makefile.dep | 2 +- boards/stm32f746g-disco/Kconfig | 2 +- boards/stm32f746g-disco/Makefile.dep | 2 +- drivers/ft5x06/Kconfig | 95 ++-------------------------- drivers/ft5x06/Makefile.include | 11 ---- tests/driver_ft5x06/Makefile | 3 +- tests/driver_ft5x06/app.config.test | 2 +- 8 files changed, 11 insertions(+), 108 deletions(-) diff --git a/boards/stm32f723e-disco/Kconfig b/boards/stm32f723e-disco/Kconfig index 19b96507d3..5613a145dc 100644 --- a/boards/stm32f723e-disco/Kconfig +++ b/boards/stm32f723e-disco/Kconfig @@ -28,7 +28,7 @@ config BOARD_STM32F723E_DISCO select BOARD_HAS_LSE select HAVE_SAUL_GPIO - select HAVE_FT6X06 + select HAVE_FT5X06 select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC # Workaround due to stdout only working with stdin enabled select MODULE_STDIN if TEST_KCONFIG diff --git a/boards/stm32f723e-disco/Makefile.dep b/boards/stm32f723e-disco/Makefile.dep index c1d0d8775c..5b27928522 100644 --- a/boards/stm32f723e-disco/Makefile.dep +++ b/boards/stm32f723e-disco/Makefile.dep @@ -5,7 +5,7 @@ ifneq (,$(filter saul_default,$(USEMODULE))) endif ifneq (,$(filter touch_dev,$(USEMODULE))) - USEMODULE += ft6x06 + USEMODULE += ft5x06 endif # TODO: remove the stdin dependency diff --git a/boards/stm32f746g-disco/Kconfig b/boards/stm32f746g-disco/Kconfig index 1309131601..41162d9844 100644 --- a/boards/stm32f746g-disco/Kconfig +++ b/boards/stm32f746g-disco/Kconfig @@ -29,6 +29,6 @@ config BOARD_STM32F746G_DISCO select BOARD_HAS_LSE select HAVE_SAUL_GPIO - select HAVE_FT5336 + select HAVE_FT5X06 source "$(RIOTBOARD)/common/stm32/Kconfig" diff --git a/boards/stm32f746g-disco/Makefile.dep b/boards/stm32f746g-disco/Makefile.dep index 874c9c8715..a3fab7ee7d 100644 --- a/boards/stm32f746g-disco/Makefile.dep +++ b/boards/stm32f746g-disco/Makefile.dep @@ -11,5 +11,5 @@ ifneq (,$(filter disp_dev,$(USEMODULE))) endif ifneq (,$(filter touch_dev,$(USEMODULE))) - USEMODULE += ft5336 + USEMODULE += ft5x06 endif diff --git a/drivers/ft5x06/Kconfig b/drivers/ft5x06/Kconfig index cdb4510fc7..b83e032b19 100644 --- a/drivers/ft5x06/Kconfig +++ b/drivers/ft5x06/Kconfig @@ -13,97 +13,12 @@ config MODULE_FT5X06 select MODULE_PERIPH_I2C select MODULE_ZTIMER select MODULE_ZTIMER_MSEC - -config MODULE_FT5606 - bool "FT5606 touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT5X16 - bool "FT5X16 touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT6X06 - bool "FT6X06 touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT6X36 - bool "FT6X36 touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT5X06I - bool "FT5X06I touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT5336 - bool "FT5336 touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT3316 - bool "FT3316 touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT5436I - bool "FT5436I touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT5336I - bool "FT5336I touch panel driver" - select MODULE_FT5X06 - -config MODULE_FT5X46 - bool "FT5X46 touch panel driver" - select MODULE_FT5X06 - -config HAVE_FT5606 - bool - select MODULE_FT5606 if MODULE_TOUCH_DEV help - Indicates that an FT5606 touch panel is present. + This driver is compatible with the following controllers: ft5x06, ft5606, ft5x16, ft6x06, + ft6x36, ft5x06i, ft5336, ft3316, ft5436i, ft5336i and ft5x46. -config HAVE_FT5X16 +config HAVE_FT5X06 bool - select MODULE_FT5X16 if MODULE_TOUCH_DEV + select MODULE_FT5X06 if MODULE_TOUCH_DEV help - Indicates that an FT5X16 touch panel is present. - -config HAVE_FT6X06 - bool - select MODULE_FT6X06 if MODULE_TOUCH_DEV - help - Indicates that an FT6X06 touch panel is present. - -config HAVE_FT6X36 - bool - select MODULE_FT6X36 if MODULE_TOUCH_DEV - help - Indicates that an FT6X36 touch panel is present. - -config HAVE_FT5X06I - bool - select MODULE_FT5X06I if MODULE_TOUCH_DEV - help - Indicates that an FT5X06I touch panel is present. - -config HAVE_FT5336 - bool - select MODULE_FT5336 if MODULE_TOUCH_DEV - help - Indicates that an FT5336 touch panel is present. - -config HAVE_FT3316 - bool - select MODULE_FT3316 if MODULE_TOUCH_DEV - help - Indicates that an FT3316 touch panel is present. - -config HAVE_FT5436I - bool - select MODULE_FT5436I if MODULE_TOUCH_DEV - help - Indicates that an FT5436I touch panel is present. - -config HAVE_FT5X46 - bool - select MODULE_FT5X46 if MODULE_TOUCH_DEV - help - Indicates that an FT5X46 touch panel is present. + Indicates that an FT5X06 touch panel is present. diff --git a/drivers/ft5x06/Makefile.include b/drivers/ft5x06/Makefile.include index 538cc66b70..29d58083b4 100644 --- a/drivers/ft5x06/Makefile.include +++ b/drivers/ft5x06/Makefile.include @@ -1,13 +1,2 @@ USEMODULE_INCLUDES_ft5x06 := $(LAST_MAKEFILEDIR)/include USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_ft5x06) - -PSEUDOMODULES += ft5606 -PSEUDOMODULES += ft5x16 -PSEUDOMODULES += ft6x06 -PSEUDOMODULES += ft6x36 -PSEUDOMODULES += ft5x06i -PSEUDOMODULES += ft5336 -PSEUDOMODULES += ft3316 -PSEUDOMODULES += ft5436i -PSEUDOMODULES += ft5336i -PSEUDOMODULES += ft5x46 diff --git a/tests/driver_ft5x06/Makefile b/tests/driver_ft5x06/Makefile index fb29d0cee5..463379084f 100644 --- a/tests/driver_ft5x06/Makefile +++ b/tests/driver_ft5x06/Makefile @@ -1,7 +1,6 @@ BOARD ?= stm32f746g-disco include ../Makefile.tests_common -DRIVER ?= ft5336 -USEMODULE += $(DRIVER) +USEMODULE += ft5x06 include $(RIOTBASE)/Makefile.include diff --git a/tests/driver_ft5x06/app.config.test b/tests/driver_ft5x06/app.config.test index 6930e993bc..7f08f5bfc1 100644 --- a/tests/driver_ft5x06/app.config.test +++ b/tests/driver_ft5x06/app.config.test @@ -1,3 +1,3 @@ # this file enables modules defined in Kconfig. Do not use this file for # application configuration. This is only needed during migration. -CONFIG_MODULE_FT5336=y +CONFIG_MODULE_FT5X06=y