aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-09-15 08:10:55 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-09-15 08:10:55 +0200
commitd14c28fc80d98cc712074c869cbd1659398e8829 (patch)
treef948eebc99fee88d52e4cf4c34fec6a9d3849c35 /target/linux/cns3xxx
parent65c5d097a4cf355473cb2c13c0835f8ad866653a (diff)
downloadupstream-d14c28fc80d98cc712074c869cbd1659398e8829.tar.gz
upstream-d14c28fc80d98cc712074c869cbd1659398e8829.tar.bz2
upstream-d14c28fc80d98cc712074c869cbd1659398e8829.zip
kernel: update kernel 4.4 to version 4.4.20
Refresh patches for all targets that support kernel 4.4. Compile-tested on brcm2708 only. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/patches-4.4/031-pcie_init.patch6
-rw-r--r--target/linux/cns3xxx/patches-4.4/110-pci_isolated_interrupts.patch4
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/cns3xxx/patches-4.4/031-pcie_init.patch b/target/linux/cns3xxx/patches-4.4/031-pcie_init.patch
index 651d1a2f07..52c73d7aee 100644
--- a/target/linux/cns3xxx/patches-4.4/031-pcie_init.patch
+++ b/target/linux/cns3xxx/patches-4.4/031-pcie_init.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-cns3xxx/laguna.c
+++ b/arch/arm/mach-cns3xxx/laguna.c
-@@ -849,7 +849,6 @@ static struct map_desc laguna_io_desc[]
+@@ -864,7 +864,6 @@ static struct map_desc laguna_io_desc[]
static void __init laguna_map_io(void)
{
cns3xxx_map_io();
@@ -8,7 +8,7 @@
iotable_init(ARRAY_AND_SIZE(laguna_io_desc));
laguna_early_serial_setup();
}
-@@ -873,15 +872,6 @@ static int laguna_register_gpio(struct g
+@@ -888,15 +887,6 @@ static int laguna_register_gpio(struct g
return ret;
}
@@ -24,7 +24,7 @@
static int __init laguna_model_setup(void)
{
u32 __iomem *mem;
-@@ -1077,5 +1067,6 @@ MACHINE_START(GW2388, "Gateworks Corpora
+@@ -1099,5 +1089,6 @@ MACHINE_START(GW2388, "Gateworks Corpora
.init_irq = cns3xxx_init_irq,
.init_time = cns3xxx_timer_init,
.init_machine = laguna_init,
diff --git a/target/linux/cns3xxx/patches-4.4/110-pci_isolated_interrupts.patch b/target/linux/cns3xxx/patches-4.4/110-pci_isolated_interrupts.patch
index f25b171938..bb01d46a3b 100644
--- a/target/linux/cns3xxx/patches-4.4/110-pci_isolated_interrupts.patch
+++ b/target/linux/cns3xxx/patches-4.4/110-pci_isolated_interrupts.patch
@@ -8,7 +8,7 @@
#include <linux/gpio.h>
#include <linux/dma-mapping.h>
#include <linux/serial_core.h>
-@@ -872,6 +873,47 @@ static int laguna_register_gpio(struct g
+@@ -887,6 +888,47 @@ static int laguna_register_gpio(struct g
return ret;
}
@@ -56,7 +56,7 @@
static int __init laguna_model_setup(void)
{
u32 __iomem *mem;
-@@ -883,8 +925,33 @@ static int __init laguna_model_setup(voi
+@@ -898,8 +940,33 @@ static int __init laguna_model_setup(voi
printk("Running on Gateworks Laguna %s\n", laguna_info.model);
cns3xxx_gpio_init( 0, 32, CNS3XXX_GPIOA_BASE_VIRT, IRQ_CNS3XXX_GPIOA,
NR_IRQS_CNS3XXX);