From b9c13dc540403877ee43369ce0027f43c7cab928 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 17 Jun 2015 10:22:04 +0000 Subject: kernel: update 3.18 to 3.18.16 Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16 Signed-off-by: Jonas Gorski Backport of r46011. git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46015 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch | 2 +- .../lantiq/patches-3.18/0030-GPIO-add-named-gpio-exports.patch | 6 +++--- .../lantiq/patches-3.18/0043-gpio-stp-xway-fix-phy-mask.patch | 2 -- .../lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch | 8 ++++---- 4 files changed, 8 insertions(+), 10 deletions(-) (limited to 'target/linux/lantiq') diff --git a/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch index 040eb1ff25..85311c21f2 100644 --- a/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch @@ -193,7 +193,7 @@ Signed-off-by: John Crispin if (ltq_pci_plat_arch_init) return ltq_pci_plat_arch_init(dev); -@@ -25,5 +31,10 @@ +@@ -25,5 +31,10 @@ int pcibios_plat_dev_init(struct pci_dev int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { diff --git a/target/linux/lantiq/patches-3.18/0030-GPIO-add-named-gpio-exports.patch b/target/linux/lantiq/patches-3.18/0030-GPIO-add-named-gpio-exports.patch index 307a99ab60..855da68285 100644 --- a/target/linux/lantiq/patches-3.18/0030-GPIO-add-named-gpio-exports.patch +++ b/target/linux/lantiq/patches-3.18/0030-GPIO-add-named-gpio-exports.patch @@ -140,9 +140,9 @@ Signed-off-by: John Crispin -int gpiod_export(struct gpio_desc *desc, bool direction_may_change) +int __gpiod_export(struct gpio_desc *desc, bool direction_may_change, const char *name) { + struct gpio_chip *chip; unsigned long flags; - int status; -@@ -557,6 +557,8 @@ int gpiod_export(struct gpio_desc *desc, +@@ -566,6 +566,8 @@ int gpiod_export(struct gpio_desc *desc, offset = gpio_chip_hwgpio(desc); if (desc->chip->names && desc->chip->names[offset]) ioname = desc->chip->names[offset]; @@ -151,7 +151,7 @@ Signed-off-by: John Crispin dev = device_create_with_groups(&gpio_class, desc->chip->dev, MKDEV(0, 0), desc, gpio_groups, -@@ -593,6 +595,12 @@ fail_unlock: +@@ -602,6 +604,12 @@ fail_unlock: gpiod_dbg(desc, "%s: status %d\n", __func__, status); return status; } diff --git a/target/linux/lantiq/patches-3.18/0043-gpio-stp-xway-fix-phy-mask.patch b/target/linux/lantiq/patches-3.18/0043-gpio-stp-xway-fix-phy-mask.patch index 967045db02..d43cdf3d54 100644 --- a/target/linux/lantiq/patches-3.18/0043-gpio-stp-xway-fix-phy-mask.patch +++ b/target/linux/lantiq/patches-3.18/0043-gpio-stp-xway-fix-phy-mask.patch @@ -10,8 +10,6 @@ Signed-off-by: Martin Blumenstingl Acked-by: John Crispin Signed-off-by: Linus Walleij -diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c -index 202361e..6d4148f 100644 --- a/drivers/gpio/gpio-stp-xway.c +++ b/drivers/gpio/gpio-stp-xway.c @@ -58,7 +58,7 @@ diff --git a/target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch b/target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch index 04de41b0fc..26a3a65142 100644 --- a/target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch +++ b/target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch @@ -9,16 +9,16 @@ #include "ifxmips_pcie.h" #include "ifxmips_pcie_reg.h" -@@ -1048,7 +1050,7 @@ pcie_rc_initialize(int pcie_port) - extern int (*ltq_pci_plat_arch_init)(struct pci_dev *dev); - extern int (*ltq_pci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin); +@@ -1045,7 +1047,7 @@ pcie_rc_initialize(int pcie_port) + return 0; + } -static int __init ifx_pcie_bios_init(void) +static int __init ifx_pcie_bios_probe(struct platform_device *pdev) { void __iomem *io_map_base; int pcie_port; -@@ -1090,6 +1092,30 @@ static int __init ifx_pcie_bios_init(voi +@@ -1083,6 +1085,30 @@ static int __init ifx_pcie_bios_init(voi return 0; } -- cgit v1.2.3