There are no platforms that have not migrated to using DM_KEYBOARD, remove the legacy option.
Cc: Simon Glass sjg@chromium.org Signed-off-by: Tom Rini trini@konsulko.com --- 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(-)
diff --git a/Makefile b/Makefile index 7cdd31f772d7..6716a578daa8 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index 815ecf55c4df..f009a8afd48c 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -48,67 +48,6 @@
DECLARE_GLOBAL_DATA_PTR;
-/* - * GPIO button - */ -#ifdef CONFIG_KEYBOARD -static struct input_config button_input; - -static int novena_gpio_button_read_keys(struct input_config *input) -{ - int key = KEY_ENTER; - if (gpio_get_value(NOVENA_BUTTON_GPIO)) - return 0; - input_send_keycodes(&button_input, &key, 1); - return 1; -} - -static int novena_gpio_button_getc(struct stdio_dev *dev) -{ - return input_getc(&button_input); -} - -static int novena_gpio_button_tstc(struct stdio_dev *dev) -{ - return input_tstc(&button_input); -} - -static int novena_gpio_button_init(struct stdio_dev *dev) -{ - gpio_direction_input(NOVENA_BUTTON_GPIO); - input_set_delays(&button_input, 250, 250); - return 0; -} - -int drv_keyboard_init(void) -{ - int error; - struct stdio_dev dev = { - .name = "button", - .flags = DEV_FLAGS_INPUT, - .start = novena_gpio_button_init, - .getc = novena_gpio_button_getc, - .tstc = novena_gpio_button_tstc, - }; - - gpio_request(NOVENA_BUTTON_GPIO, "button"); - - error = input_init(&button_input, 0); - if (error) { - debug("%s: Cannot set up input\n", __func__); - return -1; - } - input_add_tables(&button_input, false); - button_input.read_keys = novena_gpio_button_read_keys; - - error = input_stdio_register(&dev); - if (error) - return error; - - return 0; -} -#endif - int board_early_init_f(void) { #if defined(CONFIG_VIDEO_IPUV3) diff --git a/common/stdio.c b/common/stdio.c index 13083842cbd9..426e60acfbce 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -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 diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index dad3b36b9937..657db6626506 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -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 diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 35d546e63159..f6a90bb8fb34 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -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 diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index 60fc528a8ce7..d80dd8e56c94 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -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 diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig index e6f03faa87e8..8e0214d21e22 100644 --- a/configs/chromebook_speedy_defconfig +++ b/configs/chromebook_speedy_defconfig @@ -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 diff --git a/configs/novena_defconfig b/configs/novena_defconfig index d4ab93850c4a..09338c4ce916 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -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 diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 263fcee706f2..fbc4a9244f61 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -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 diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 3a22f6b26fa4..23aa15236cb6 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -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 diff --git a/doc/develop/driver-model/migration.rst b/doc/develop/driver-model/migration.rst index 742fea5515cc..645c45bc4919 100644 --- a/doc/develop/driver-model/migration.rst +++ b/doc/develop/driver-model/migration.rst @@ -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 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 2718b3674a58..1c534be00580 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -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 diff --git a/drivers/input/Makefile b/drivers/input/Makefile index b1133f772f23..ded76bddb229 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -3,7 +3,6 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-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