From b1816c7d0c2830dd78a0a95a1fa749e32fcfb5b0 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 13 Jan 2024 13:50:40 +0800 Subject: [PATCH] gpio-button-hotplug: fix kernel 5.4 support --- package/kernel/gpio-button-hotplug/Makefile | 2 +- .../kernel/gpio-button-hotplug/src/gpio-button-hotplug.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/kernel/gpio-button-hotplug/Makefile b/package/kernel/gpio-button-hotplug/Makefile index 7ca6195a0..bb2c35119 100644 --- a/package/kernel/gpio-button-hotplug/Makefile +++ b/package/kernel/gpio-button-hotplug/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2012 OpenWrt.org +# Copyright (C) 2008-2024 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index cb8c00de4..f3705344a 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -538,10 +538,14 @@ static int gpio_keys_button_probe(struct platform_device *pdev, struct device_node *child = of_get_next_child(dev->of_node, prev); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) bdata->gpiod = devm_fwnode_gpiod_get(dev, of_fwnode_handle(child), "gpios", GPIOD_IN, desc); - +#else + bdata->gpiod = devm_gpiod_get_from_of_node(dev, + child, "gpios", 0, GPIOD_IN, desc); +#endif prev = child; }