[openwrt/openwrt] rockchip: use downstream GPIO button implementation

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/875a04478c177808e86a6a615f0ae0cfe541f2c2

commit 875a04478c177808e86a6a615f0ae0cfe541f2c2
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Mon Jul 13 17:44:07 2020 +0200

    rockchip: use downstream GPIO button implementation
    
    Use the OpenWrt netlink GPIO button implementation to forward button
    presses to procd. This is necessary to make failsafe-mode access
    using a button possible.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 target/linux/rockchip/Makefile         | 2 +-
 target/linux/rockchip/armv8/config-5.4 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile
index 41f0560bac..8daaad34a7 100644
--- a/target/linux/rockchip/Makefile
+++ b/target/linux/rockchip/Makefile
@@ -17,7 +17,7 @@ endef
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs
+DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug
 
 KERNELNAME:=Image dtbs
 
diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4
index 48b05b432b..2d2342e34f 100644
--- a/target/linux/rockchip/armv8/config-5.4
+++ b/target/linux/rockchip/armv8/config-5.4
@@ -221,7 +221,6 @@ CONFIG_KALLSYMS=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEXEC_FILE=y
 # CONFIG_KEXEC_SIG is not set
-CONFIG_KEYBOARD_GPIO=y
 CONFIG_KSM=y
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 CONFIG_LEDS_GPIO=y