aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-29 11:09:29 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-30 16:46:52 +0200
commitdb94ee62567c786bc7ca2c1ed0bcf650b77a598e (patch)
tree13a33f41e24a386f602e71787b140e1cfaa3f3d1 /target/linux
parent22378beb581b113def1dc392ef75306a2168a163 (diff)
downloadupstream-db94ee62567c786bc7ca2c1ed0bcf650b77a598e.tar.gz
upstream-db94ee62567c786bc7ca2c1ed0bcf650b77a598e.tar.bz2
upstream-db94ee62567c786bc7ca2c1ed0bcf650b77a598e.zip
kernel: bump 4.14 to 4.14.141
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch4
-rw-r--r--target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
index 830523e3bc..dc854fac48 100644
--- a/target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Device and char device-related information */
static DEFINE_IDA(gpio_ida);
static dev_t gpio_devt;
-@@ -2305,7 +2307,7 @@ static int _gpiod_direction_output_raw(s
+@@ -2307,7 +2309,7 @@ static int _gpiod_direction_output_raw(s
int ret;
/* GPIOs used for IRQs shall not be set as output */
@@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
gpiod_err(desc,
"%s: tried to set a GPIO tied to an IRQ as output\n",
__func__);
-@@ -2820,7 +2822,7 @@ int gpiochip_lock_as_irq(struct gpio_chi
+@@ -2822,7 +2824,7 @@ int gpiochip_lock_as_irq(struct gpio_chi
set_bit(FLAG_IS_OUT, &desc->flags);
}
diff --git a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch
index 49156a0ada..f9af81f104 100644
--- a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch
+++ b/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch
@@ -89,7 +89,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
-@@ -1940,7 +1940,8 @@ int gpiochip_add_pingroup_range(struct g
+@@ -1942,7 +1942,8 @@ int gpiochip_add_pingroup_range(struct g
list_add_tail(&pin_range->node, &gdev->pin_ranges);
@@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
}
EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range);
-@@ -1992,7 +1993,7 @@ int gpiochip_add_pin_range(struct gpio_c
+@@ -1994,7 +1995,7 @@ int gpiochip_add_pin_range(struct gpio_c
list_add_tail(&pin_range->node, &gdev->pin_ranges);