diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 09:54:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 09:54:55 +0000 |
| commit | 9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6 (patch) | |
| tree | 3c4aef6e759fbdd74af7f5e14a495f531dc88515 /target/linux/lantiq | |
| parent | e952654f0b002e6494cfdb705ee8f0646798dd6c (diff) | |
| download | mtk-20170518-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.zip mtk-20170518-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.tar.gz mtk-20170518-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.tar.bz2 | |
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 <jogo@openwrt.org>
SVN-Revision: 46011
Diffstat (limited to 'target/linux/lantiq')
4 files changed, 8 insertions, 10 deletions
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 040eb1f..85311c2 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 <blogic@openwrt.org> 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 307a99a..855da68 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 <blogic@openwrt.org> -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 <blogic@openwrt.org> 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 967045d..d43cdf3 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 <martin.blumenstingl@googlemail.com> Acked-by: John Crispin <blogic@openwrt.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> -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 04de41b..26a3a65 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; } |