diff options
| author | Tom Rini <[email protected]> | 2023-03-31 10:04:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-03-31 10:04:23 -0400 |
| commit | b8deed53fe6a55ef76b4f9038bb419a9c853a9fa (patch) | |
| tree | 2f0cdb8f35d7c51611417bab680583a65bf21306 /drivers/input | |
| parent | f1617e99b933d2c3ecb381954148284d37bf922e (diff) | |
| parent | f98b112f9e0516fc9333611d1228d0b634aa353e (diff) | |
Merge branch '2023-03-30-assorted-general-upates' into next
- RTC cleanups / improvements, run_commandf() cleanups, fs bugfixes,
socrates config fix, PCI MPS support, GPIO improvements, other code
cleanups
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/button_kbd.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 32360d94c05..c2b365af11d 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 99e65f12f01..74fadfca8bb 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" +}; |