Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

input: Remove legacy KEYBOARD option

Browse source 
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>
This commit is contained in:
Tom Rini 2022-10-14 07:50:20 -04:00
parent 9af4a0c8a6
commit f60e6f6767
13 changed files with 0 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -1141,7 +1141,6 @@ endif
$(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\ $(call deprecated,CONFIG_WDT,DM watchdog,v2019.10,\
$(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG))
$(call deprecated,CONFIG_DM_I2C,I2C drivers,v2022.04,$(CONFIG_SYS_I2C_LEGACY)) $(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 @# CONFIG_SYS_TIMER_RATE has brackets in it for some boards which
@# confuses this rule. Use if() to send just a single character which @# confuses this rule. Use if() to send just a single character which
@# is enable to tell 'deprecated' that one of these symbols exists @# is enable to tell 'deprecated' that one of these symbols exists

61
board/kosagi/novena/novena.c
View file

@ -48,67 +48,6 @@
DECLARE_GLOBAL_DATA_PTR; 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) int board_early_init_f(void)
{ {
#if defined(CONFIG_VIDEO_IPUV3) #if defined(CONFIG_VIDEO_IPUV3)

3
common/stdio.c
View file

@ -373,9 +373,6 @@ int stdio_add_devices(void)
drv_video_init(); drv_video_init();
} }
#if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD)
drv_keyboard_init();
#endif
drv_system_init(); drv_system_init();
serial_stdio_init(); serial_stdio_init();
#ifdef CONFIG_USB_TTY #ifdef CONFIG_USB_TTY

1
configs/chromebit_mickey_defconfig
View file

@ -68,7 +68,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_I2C_MUX=y CONFIG_I2C_MUX=y
CONFIG_DM_KEYBOARD=y CONFIG_DM_KEYBOARD=y
CONFIG_KEYBOARD=y
CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC_KEYB=y
CONFIG_CROS_EC=y CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y CONFIG_CROS_EC_SPI=y

1
configs/chromebook_jerry_defconfig
View file

@ -70,7 +70,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_I2C_MUX=y CONFIG_I2C_MUX=y
CONFIG_DM_KEYBOARD=y CONFIG_DM_KEYBOARD=y
CONFIG_KEYBOARD=y
CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC_KEYB=y
CONFIG_CROS_EC=y CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y CONFIG_CROS_EC_SPI=y

1
configs/chromebook_minnie_defconfig
View file

@ -70,7 +70,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_I2C_MUX=y CONFIG_I2C_MUX=y
CONFIG_DM_KEYBOARD=y CONFIG_DM_KEYBOARD=y
CONFIG_KEYBOARD=y
CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC_KEYB=y
CONFIG_CROS_EC=y CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y CONFIG_CROS_EC_SPI=y

1
configs/chromebook_speedy_defconfig
View file

@ -69,7 +69,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_I2C_MUX=y CONFIG_I2C_MUX=y
CONFIG_DM_KEYBOARD=y CONFIG_DM_KEYBOARD=y
CONFIG_KEYBOARD=y
CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC_KEYB=y
CONFIG_CROS_EC=y CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y CONFIG_CROS_EC_SPI=y

1
configs/novena_defconfig
View file

@ -67,7 +67,6 @@ CONFIG_LBA48=y
CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_LEGACY=y
CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y
CONFIG_SYS_I2C_MXC=y CONFIG_SYS_I2C_MXC=y
CONFIG_KEYBOARD=y
CONFIG_FSL_USDHC=y CONFIG_FSL_USDHC=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y

1
configs/smdk5250_defconfig
View file

@ -48,7 +48,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_ENV_SPI_BUS=1 CONFIG_ENV_SPI_BUS=1
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_SYS_I2C_S3C24X0=y CONFIG_SYS_I2C_S3C24X0=y
# CONFIG_KEYBOARD is not set
CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y

1
configs/smdk5420_defconfig
View file

@ -43,7 +43,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_ENV_SPI_BUS=1 CONFIG_ENV_SPI_BUS=1
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_SYS_I2C_S3C24X0=y CONFIG_SYS_I2C_S3C24X0=y
# CONFIG_KEYBOARD is not set
CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y

8
doc/develop/driver-model/migration.rst
View file

@ -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 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. 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 CONFIG_SYS_TIMER_RATE and CONFIG_SYS_TIMER_COUNTER
-------------------------------------------------- --------------------------------------------------
Deadline: 2023.01 Deadline: 2023.01

9
drivers/input/Kconfig
View file

@ -38,15 +38,6 @@ config TPL_DM_KEYBOARD
includes methods to start/stop the device, check for available includes methods to start/stop the device, check for available
input and update LEDs if the keyboard has them. 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 config APPLE_SPI_KEYB
bool "Enable Apple SPI keyboard support" bool "Enable Apple SPI keyboard support"
depends on DM_KEYBOARD && DM_SPI depends on DM_KEYBOARD && DM_SPI

1
drivers/input/Makefile
View file

@ -3,7 +3,6 @@
# (C) Copyright 2000-2007 # (C) Copyright 2000-2007
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # 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_)CROS_EC_KEYB) += cros_ec_keyb.o
obj-$(CONFIG_$(SPL_TPL_)OF_CONTROL) += key_matrix.o obj-$(CONFIG_$(SPL_TPL_)OF_CONTROL) += key_matrix.o
obj-$(CONFIG_$(SPL_TPL_)DM_KEYBOARD) += input.o keyboard-uclass.o obj-$(CONFIG_$(SPL_TPL_)DM_KEYBOARD) += input.o keyboard-uclass.o