forked from Ivasoft/openwrt
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
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user