diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-20 15:44:46 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-25 10:23:44 +0100 |
| commit | 1be6ff6dc0ab53d2191c49c32cae7f6f9aadd14d (patch) | |
| tree | c74ba48057ac30f3ae7d1a8efb6ed658251ce215 /target/linux/ipq40xx | |
| parent | e9cb40caa4456cefc1b4bef0c9ab26a7b8d3a653 (diff) | |
| download | upstream-1be6ff6dc0ab53d2191c49c32cae7f6f9aadd14d.tar.gz upstream-1be6ff6dc0ab53d2191c49c32cae7f6f9aadd14d.tar.bz2 upstream-1be6ff6dc0ab53d2191c49c32cae7f6f9aadd14d.zip | |
kernel: bump 4.14 to 4.14.102
Refreshed all patches.
Remove upstreamed:
- 272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
Remove upstreamed hunks:
- 105-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch
Fixes:
- CVE-2018-1000026
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ipq40xx')
| -rw-r--r-- | target/linux/ipq40xx/patches-4.14/105-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/105-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch b/target/linux/ipq40xx/patches-4.14/105-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch index 294466ed0c..e2e64957c4 100644 --- a/target/linux/ipq40xx/patches-4.14/105-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch +++ b/target/linux/ipq40xx/patches-4.14/105-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch @@ -69,35 +69,3 @@ Origin: other, https://patchwork.kernel.org/patch/10339127/ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; ---- a/drivers/pinctrl/qcom/pinctrl-msm.c -+++ b/drivers/pinctrl/qcom/pinctrl-msm.c -@@ -839,11 +839,24 @@ static int msm_gpio_init(struct msm_pinc - return ret; - } - -- ret = gpiochip_add_pin_range(&pctrl->chip, dev_name(pctrl->dev), 0, 0, chip->ngpio); -- if (ret) { -- dev_err(pctrl->dev, "Failed to add pin range\n"); -- gpiochip_remove(&pctrl->chip); -- return ret; -+ /* -+ * For DeviceTree-supported systems, the gpio core checks the -+ * pinctrl's device node for the "gpio-ranges" property. -+ * If it is present, it takes care of adding the pin ranges -+ * for the driver. In this case the driver can skip ahead. -+ * -+ * In order to remain compatible with older, existing DeviceTree -+ * files which don't set the "gpio-ranges" property or systems that -+ * utilize ACPI the driver has to call gpiochip_add_pin_range(). -+ */ -+ if (!of_property_read_bool(pctrl->dev->of_node, "gpio-ranges")) { -+ ret = gpiochip_add_pin_range(&pctrl->chip, -+ dev_name(pctrl->dev), 0, 0, chip->ngpio); -+ if (ret) { -+ dev_err(pctrl->dev, "Failed to add pin range\n"); -+ gpiochip_remove(&pctrl->chip); -+ return ret; -+ } - } - - ret = gpiochip_irqchip_add(chip, |