aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2020-03-06 13:12:02 +0100
committerDaniel Golle <daniel@makrotopia.org>2020-03-06 13:14:02 +0100
commitca6885456fe2307d8cee850bd1c41e7ebfe74a38 (patch)
tree4c28b15ed81a31bcf4c1b9c532bf49eea2be311e /target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch
parenta017773a92d624142a78452bc0c00e6bc6523967 (diff)
downloadupstream-ca6885456fe2307d8cee850bd1c41e7ebfe74a38.tar.gz
upstream-ca6885456fe2307d8cee850bd1c41e7ebfe74a38.tar.bz2
upstream-ca6885456fe2307d8cee850bd1c41e7ebfe74a38.zip
ath79: re-add accidentally dropped patch to kernel 5.4
Patch 0061-tty-serial-ar933x-uart-rs485-gpio.patch wasn't included when adding support for kernel 5.4. Re-add it and refresh patches. Fixes: 53ab9865c2 ("ath79: add support for kernel 5.4") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch')
-rw-r--r--target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch b/target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch
index c07d3d3fea..d4ea379159 100644
--- a/target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch
+++ b/target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch
@@ -22,8 +22,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include "gpiolib.h"
#include "gpiolib-of.h"
-@@ -895,3 +897,68 @@ void of_gpiochip_remove(struct gpio_chip
- gpiochip_remove_pin_ranges(chip);
+@@ -915,3 +917,68 @@ void of_gpiochip_remove(struct gpio_chip
+ {
of_node_put(chip->of_node);
}
+
@@ -141,7 +141,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
{
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
-@@ -661,6 +661,7 @@ static inline void devm_acpi_dev_remove_
+@@ -668,6 +668,7 @@ static inline void devm_acpi_dev_remove_
#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
@@ -149,7 +149,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
int gpiod_export(struct gpio_desc *desc, bool direction_may_change);
int gpiod_export_link(struct device *dev, const char *name,
struct gpio_desc *desc);
-@@ -668,6 +669,13 @@ void gpiod_unexport(struct gpio_desc *de
+@@ -675,6 +676,13 @@ void gpiod_unexport(struct gpio_desc *de
#else /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */