diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-13 12:50:25 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-13 19:17:41 +0200 |
| commit | 09050b6fe22848c6b8d59a437e357c7ad34bc523 (patch) | |
| tree | 30cd5f93b5da3a0096b7ca214a466e810c93a602 /target/linux/brcm63xx | |
| parent | 461ef393451842c28abffdb42250dd55d5ee85fb (diff) | |
| download | upstream-09050b6fe22848c6b8d59a437e357c7ad34bc523.tar.gz upstream-09050b6fe22848c6b8d59a437e357c7ad34bc523.tar.bz2 upstream-09050b6fe22848c6b8d59a437e357c7ad34bc523.zip | |
kernel: bump 4.14 to 4.14.118
Refreshed all patches.
Remove upstreamed:
- 060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch
Altered:
- 143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm63xx')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch | 21 |
1 files changed, 14 insertions, 7 deletions
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 436f1aa532..61e1b282c7 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 @@ -68,18 +68,25 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> ret = gpiod_hog(desc, name, lflags, dflags); if (ret < 0) { of_node_put(np); -@@ -499,7 +506,10 @@ int of_gpiochip_add(struct gpio_chip *ch +@@ -499,12 +506,13 @@ int of_gpiochip_add(struct gpio_chip *ch of_node_get(chip->of_node); -- return of_gpiochip_scan_gpios(chip); -+ if (!chip->request) -+ status = of_gpiochip_scan_gpios(chip, 0, chip->ngpio); -+ -+ return status; +- status = of_gpiochip_scan_gpios(chip); +- if (status) { +- of_node_put(chip->of_node); +- gpiochip_remove_pin_ranges(chip); ++ if (!chip->request) { ++ status = of_gpiochip_scan_gpios(chip); ++ if (status) { ++ of_node_put(chip->of_node); ++ gpiochip_remove_pin_ranges(chip); ++ } + } +- + return status; } - void of_gpiochip_remove(struct gpio_chip *chip) --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1938,7 +1938,8 @@ int gpiochip_add_pingroup_range(struct g |