aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSvyatoslav Ryhel <clamor95@gmail.com>2023-03-20 21:06:30 +0200
committerTom Rini <trini@konsulko.com>2023-03-30 15:09:59 -0400
commit25df91520e964911dcfa71638834df2854e14024 (patch)
treebc06e34a0b52ab7ac17cff240eb31502a03a8d72
parenta57adacf50d1bc0b5efd85b484a5c52a4c1ebcf1 (diff)
downloadu-boot-25df91520e964911dcfa71638834df2854e14024.zip
u-boot-25df91520e964911dcfa71638834df2854e14024.tar.gz
u-boot-25df91520e964911dcfa71638834df2854e14024.tar.bz2
input: button_kbd: make driver complementary to gpio buttons
Remove need of dts binding for button keyboard since it reuses gpio-keys binding. Select gpio-keys driver if button keyboard is selected since button keyboard can not operate on its own. Tested-by: Svyatoslav Ryhel <clamor95@gmail.com> # HTC One X T30 Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--drivers/input/Kconfig2
-rw-r--r--drivers/input/button_kbd.c10
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 32360d9..c2b365a 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -48,8 +48,8 @@ config APPLE_SPI_KEYB
config BUTTON_KEYBOARD
bool "Buttons as keyboard"
- depends on BUTTON_GPIO
depends on DM_KEYBOARD
+ select BUTTON_GPIO
help
Enable support for mapping buttons to keycode events. Use linux,code button driver
dt node to define button-event mapping.
diff --git a/drivers/input/button_kbd.c b/drivers/input/button_kbd.c
index 99e65f1..74fadfc 100644
--- a/drivers/input/button_kbd.c
+++ b/drivers/input/button_kbd.c
@@ -111,16 +111,14 @@ static int button_kbd_probe(struct udevice *dev)
return 0;
}
-static const struct udevice_id button_kbd_ids[] = {
- { .compatible = "button-kbd" },
- { }
-};
-
U_BOOT_DRIVER(button_kbd) = {
.name = "button_kbd",
.id = UCLASS_KEYBOARD,
- .of_match = button_kbd_ids,
.ops = &button_kbd_ops,
.priv_auto = sizeof(struct button_kbd_priv),
.probe = button_kbd_probe,
};
+
+U_BOOT_DRVINFO(button_kbd) = {
+ .name = "button_kbd"
+};