input: Remove legacy KEYBOARD option

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>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/Makefile b/Makefile
index 7cdd31f772d79440e7b89bbd3980e8fd95cb8b6f..6716a578daa8b5b69d21dc7f8f4ae038af564f2e 100644 (file)
--- 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 815ecf55c4df005ac0641a214b0b339823f5ed9e..f009a8afd48c32507b3172402a4ae78a6b5affa7 100644 (file)
--- 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 e316a355fae0eb5cd112bf0e721b9f926e1a8b1b..92811badb88dce72cb28044437cd69677ded400e 100644 (file)
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -373,9 +373,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 dad3b36b99374842441d94dfcee3a84536944169..657db6626506ba8fc385ae3aad4f2b20a1a2190f 100644 (file)
--- 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 a60468eafa5adad4f4d9ad44735fbbc544dc25af..13ffafceec354a6943ddd84e06b719bbb26eb3a3 100644 (file)
--- 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 60fc528a8ce70182c87b3fd4862addcce72fd2f3..d80dd8e56c940160e64512139285cd33dfbe46b5 100644 (file)
--- 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 e6f03faa87e8a9177466c7823b1881f690390210..8e0214d21e2258e1f9c398e7b19b9cb7f4ba9d7b 100644 (file)
--- 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 d4ab93850c4a1a9fddf8cd596a80ef17e808cca8..09338c4ce916e18076b4ba2c58cb066c6798e464 100644 (file)
--- 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 263fcee706f20419b00f4b3309efc500dd5ff6d9..fbc4a9244f61d28d46855d26de84123d18504c7f 100644 (file)
--- 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 3a22f6b26fa4f5217fdc67c26501e3f0e6cc4b8a..23aa15236cb6a3559df160842349b0de9bf3ca8d 100644 (file)
--- 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 742fea5515cc202d209a51a4305176fedd4eebb9..645c45bc4919e71b7882fa658238b1eec914898a 100644 (file)
--- 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 2718b3674a58bc617219f33bad98b14bf5345d4a..1c534be005804d3f8c0ca72970b78267bcfad138 100644 (file)
--- 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 b1133f772f23dad18e52ae33c38216e03a2adf7e..ded76bddb2298ccd06e8cfa491d958edf1b6dbea 100644 (file)
--- 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