Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D3285C4332F for ; Fri, 14 Oct 2022 11:50:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9B09484E76; Fri, 14 Oct 2022 13:50:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="TUdPyj45"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 93FC684C47; Fri, 14 Oct 2022 13:50:29 +0200 (CEST) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6987F84CB2 for ; Fri, 14 Oct 2022 13:50:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x833.google.com with SMTP id c23so3451970qtw.8 for ; Fri, 14 Oct 2022 04:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H802a9CDUrjS+86OiyvqR0k0YWCT5ASmYbLDN8gSAbg=; b=TUdPyj45VkKYYlCjxzrj4kYzPMDXnAKB98IGpRgjb4yAUwe1GhBXjieBw473Vc0g4T OqmWh+Z3EfAGc/tk8nFtveyfuxHPtdkq9lI3P8ZgoxwwM9EFZXt7I1xeL1x2+1Heh3x6 Df2iRo+Ij/4rvkt9zBBBnHaKVWpxMEZPjIS9A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H802a9CDUrjS+86OiyvqR0k0YWCT5ASmYbLDN8gSAbg=; b=JwqSNudixzYPuHX+kHpY/+GUJ8AFmkB28idS46BbAjvqnYP/vwLW02LZi3OuCCjN6D O3k3A8pJOpb9AUgGEI5y2gr42+PFMrwfdLo6m4alrpn5/eFqdNYPG6DCkuX/0OQwaxNs 9KNKvMrDPAHngprbhrXt5+p0d5QSkBA+Ud9m45bJkz2yrQ3g/pNpVCZdsQRTpLOqzU2L HeUO0ZkovilRI1oPR9NBLVM5ye9DBIJhl9TRPsb2TI1Vf8rcetnDvUNtciWF3GV3AwWS nwXUZey2JfnW933NekxjjrtbgYx6+6q5h3o6WWp0v8ZDPHfKLcqtEn65QprYXhNiV1kV nAtQ== X-Gm-Message-State: ACrzQf1EhMMSmsQjnyDEZPQp02BetAiKfHOizLj+JQ010bTR3z84HgnV tn4N8uUezaLqx+Z1ehZUK/KU+roIJKKn7A== X-Google-Smtp-Source: AMsMyM5TifIipVWQkf3lmxVdvjn0En43fGmh079IYLMJll1YkaMqweUc7a26uxuhd1kCPWUVEKzibQ== X-Received: by 2002:ac8:5e10:0:b0:392:f65a:292e with SMTP id h16-20020ac85e10000000b00392f65a292emr3704738qtx.407.1665748223892; Fri, 14 Oct 2022 04:50:23 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-b049-0e25-0576-9c40.res6.spectrum.com. [2603:6081:7b00:6400:b049:e25:576:9c40]) by smtp.gmail.com with ESMTPSA id i9-20020a05620a404900b006bc192d277csm2353740qko.10.2022.10.14.04.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 04:50:23 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [PATCH 2/2] input: Remove legacy KEYBOARD option Date: Fri, 14 Oct 2022 07:50:20 -0400 Message-Id: <20221014115020.961189-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221014115020.961189-1-trini@konsulko.com> References: <20221014115020.961189-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean There are no platforms that have not migrated to using DM_KEYBOARD, remove the legacy option. Cc: Simon Glass Signed-off-by: Tom Rini --- 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 -- 2.25.1