Skip to contentSkip to conversation

core: Enable DM by default

PATCH In review Tom Rini 2 participants 5 messages Oct 14, 2022 – Oct 21, 2022

Subsystems (2)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/2 core: Enable DM by default

There are no longer any platforms which do not enable DM, move this to a def_bool y and remove the check in the Makefile.

---
 Makefile             | 8 --------
 drivers/core/Kconfig | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
Makefile +0 -8
index 3866cc62f9a0..7cdd31f772d7 100644
@@ -1137,14 +1137,6 @@ ifneq ($(CONFIG_SPL_FIT_GENERATOR),)
 	@echo >&2 "to binman instead, to avoid the proliferation of"
 	@echo >&2 "arch-specific scripts with no tests."
 	@echo >&2 "===================================================="
-endif
-ifneq ($(CONFIG_DM),y)
-	@echo >&2 "===================== WARNING ======================"
-	@echo >&2 "This board does not use CONFIG_DM. CONFIG_DM will be"
-	@echo >&2 "compulsory starting with the v2020.01 release."
-	@echo >&2 "Failure to update may result in board removal."
-	@echo >&2 "See doc/develop/driver-model/migration.rst for more info."
-	@echo >&2 "===================================================="
 endif
 	$(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\
 		$(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG))
drivers/core/Kconfig +1 -1
index c9bf5de4332b..0dc442b921c1 100644
@@ -1,7 +1,7 @@
 menu "Generic Driver Options"
 
 config DM
-	bool "Enable Driver Model"
+	def_bool y
 	help
 	  This config option enables Driver Model. This brings in the core
 	  support, including scanning of platform data on start-up. If
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 input: Remove legacy KEYBOARD option

There are no platforms that have not migrated to using DM_KEYBOARD, remove the legacy option.

---
 Makefile                               |  1 -
 board/kosagi/novena/novena.c           | 61 --------------------------
 common/stdio.c                         |  3 --
 configs/chromebit_mickey_defconfig     |  1 -
 configs/chromebook_jerry_defconfig     |  1 -
 configs/chromebook_minnie_defconfig    |  1 -
 configs/chromebook_speedy_defconfig    |  1 -
 configs/novena_defconfig               |  1 -
 configs/smdk5250_defconfig             |  1 -
 configs/smdk5420_defconfig             |  1 -
 doc/develop/driver-model/migration.rst |  8 ----
 drivers/input/Kconfig                  |  9 ----
 drivers/input/Makefile                 |  1 -
 13 files changed, 90 deletions(-)
Makefile +0 -1
index 7cdd31f772d7..6716a578daa8 100644
@@ -1141,7 +1141,6 @@ endif
 	$(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\
 		$(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG))
 	$(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_SYS_I2C_LEGACY))
-	$(call deprecated,CONFIG_DM_KEYBOARD,Keyboard drivers,v2022.10,$(CONFIG_KEYBOARD))
 	@# CONFIG_SYS_TIMER_RATE has brackets in it for some boards which
 	@# confuses this rule. Use if() to send just a single character which
 	@# is enable to tell 'deprecated' that one of these symbols exists
board/kosagi/novena/novena.c +0 -61

67 lines not on this page · raw message

common/stdio.c +0 -3
index 13083842cbd9..426e60acfbce 100644
@@ -379,9 +379,6 @@ int stdio_add_devices(void)
 			drv_video_init();
 	}
 
-#if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD)
-	drv_keyboard_init();
-#endif
 	drv_system_init();
 	serial_stdio_init();
 #ifdef CONFIG_USB_TTY
configs/chromebit_mickey_defconfig +0 -1
index dad3b36b9937..657db6626506 100644
@@ -68,7 +68,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
 CONFIG_DM_KEYBOARD=y
-CONFIG_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
configs/chromebook_jerry_defconfig +0 -1
index 35d546e63159..f6a90bb8fb34 100644
@@ -70,7 +70,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
 CONFIG_DM_KEYBOARD=y
-CONFIG_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
configs/chromebook_minnie_defconfig +0 -1
index 60fc528a8ce7..d80dd8e56c94 100644
@@ -70,7 +70,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
 CONFIG_DM_KEYBOARD=y
-CONFIG_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
configs/chromebook_speedy_defconfig +0 -1
index e6f03faa87e8..8e0214d21e22 100644
@@ -69,7 +69,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
 CONFIG_DM_KEYBOARD=y
-CONFIG_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
configs/novena_defconfig +0 -1
index d4ab93850c4a..09338c4ce916 100644
@@ -67,7 +67,6 @@ CONFIG_LBA48=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y
-CONFIG_KEYBOARD=y
 CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/smdk5250_defconfig +0 -1
index 263fcee706f2..fbc4a9244f61 100644
@@ -48,7 +48,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_I2C_S3C24X0=y
-# CONFIG_KEYBOARD is not set
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
configs/smdk5420_defconfig +0 -1
index 3a22f6b26fa4..23aa15236cb6 100644
@@ -43,7 +43,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_I2C_S3C24X0=y
-# CONFIG_KEYBOARD is not set
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
doc/develop/driver-model/migration.rst +0 -8
index 742fea5515cc..645c45bc4919 100644
@@ -99,14 +99,6 @@ The I2C subsystem has supported the driver model since early 2015.
 Maintainers should submit patches switching over to using CONFIG_DM_I2C and
 other base driver model options in time for inclusion in the 2021.10 release.
 
-CONFIG_KEYBOARD
----------------
-Deadline: 2022.10
-
-This is a legacy option which has been replaced by driver model.
-Maintainers should submit patches switching over to using CONFIG_DM_KEYBOARD and
-other base driver model options in time for inclusion in the 2022.10 release.
-
 CONFIG_SYS_TIMER_RATE and CONFIG_SYS_TIMER_COUNTER
 --------------------------------------------------
 Deadline: 2023.01
drivers/input/Kconfig +0 -9
index 2718b3674a58..1c534be00580 100644
@@ -38,15 +38,6 @@ config TPL_DM_KEYBOARD
 	  includes methods to start/stop the device, check for available
 	  input and update LEDs if the keyboard has them.
 
-config KEYBOARD
-	bool "Enable legacy keyboard support (deprecated)"
-	help
-	  Enable this to enable a custom keyboard support.
-	  This simply calls drv_keyboard_init() which must be
-	  defined in your board-specific files. This option is deprecated
-	  and is only used by novena. For new boards, use driver model
-	  instead.
-
 config APPLE_SPI_KEYB
 	bool "Enable Apple SPI keyboard support"
 	depends on DM_KEYBOARD && DM_SPI
drivers/input/Makefile +0 -1
index b1133f772f23..ded76bddb229 100644
@@ -3,7 +3,6 @@
 # (C) Copyright 2000-2007
 # Wolfgang Denk, DENX Software Engineering, [email protected].
 
-obj-$(CONFIG_KEYBOARD) += input.o
 obj-$(CONFIG_$(SPL_TPL_)CROS_EC_KEYB) += cros_ec_keyb.o
 obj-$(CONFIG_$(SPL_TPL_)OF_CONTROL) += key_matrix.o
 obj-$(CONFIG_$(SPL_TPL_)DM_KEYBOARD) += input.o keyboard-uclass.o
Signature · 1 line
2.25.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] input: Remove legacy KEYBOARD option

Quoted 6 lines · Tom Rini

There are no platforms that have not migrated to using DM_KEYBOARD, remove the legacy option.

Quoted 16 lines
---
 Makefile                               |  1 -
 board/kosagi/novena/novena.c           | 61 --------------------------
 common/stdio.c                         |  3 --
 configs/chromebit_mickey_defconfig     |  1 -
 configs/chromebook_jerry_defconfig     |  1 -
 configs/chromebook_minnie_defconfig    |  1 -
 configs/chromebook_speedy_defconfig    |  1 -
 configs/novena_defconfig               |  1 -
 configs/smdk5250_defconfig             |  1 -
 configs/smdk5420_defconfig             |  1 -
 doc/develop/driver-model/migration.rst |  8 ----
 drivers/input/Kconfig                  |  9 ----
 drivers/input/Makefile                 |  1 -
 13 files changed, 90 deletions(-)
author
#4 lore raw
In reply to Tom Rini
Quoted 4 lines · Tom Rini

There are no longer any platforms which do not enable DM, move this to a def_bool y and remove the check in the Makefile.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom