diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
commit | 6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch) | |
tree | b35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/ixp4xx/patches-3.14/300-avila_support.patch | |
parent | a899dbd4e32835b0a1d917479d10e5a2744c273c (diff) | |
download | master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2 master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-3.14/300-avila_support.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-3.14/300-avila_support.patch | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/target/linux/ixp4xx/patches-3.14/300-avila_support.patch b/target/linux/ixp4xx/patches-3.14/300-avila_support.patch index 2e39328c13..d2dafaa5cd 100644 --- a/target/linux/ixp4xx/patches-3.14/300-avila_support.patch +++ b/target/linux/ixp4xx/patches-3.14/300-avila_support.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-pci.c -=================================================================== ---- linux-3.14.25.orig/arch/arm/mach-ixp4xx/avila-pci.c 2014-11-30 15:25:58.890640602 +0100 -+++ linux-3.14.25/arch/arm/mach-ixp4xx/avila-pci.c 2014-11-30 15:26:43.548148782 +0100 +--- a/arch/arm/mach-ixp4xx/avila-pci.c ++++ b/arch/arm/mach-ixp4xx/avila-pci.c @@ -27,8 +27,8 @@ #include <mach/hardware.h> #include <asm/mach-types.h> @@ -13,7 +11,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-pci.c #define IRQ_LINES 4 /* PCI controller GPIO to IRQ pin mappings */ -@@ -55,10 +55,8 @@ +@@ -55,10 +55,8 @@ static int __init avila_map_irq(const st IXP4XX_GPIO_IRQ(INTD) }; @@ -26,10 +24,8 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-pci.c return -1; } -Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c -=================================================================== ---- linux-3.14.25.orig/arch/arm/mach-ixp4xx/avila-setup.c 2014-11-30 15:25:58.890640602 +0100 -+++ linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c 2014-11-30 16:03:14.803148025 +0100 +--- a/arch/arm/mach-ixp4xx/avila-setup.c ++++ b/arch/arm/mach-ixp4xx/avila-setup.c @@ -14,9 +14,16 @@ #include <linux/kernel.h> #include <linux/init.h> @@ -73,7 +69,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c static struct flash_platform_data avila_flash_data = { .map_name = "cfi_probe", .width = 2, -@@ -105,14 +127,69 @@ +@@ -105,14 +127,69 @@ static struct platform_device avila_uart .resource = avila_uart_resources }; @@ -147,7 +143,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c .name = "intrq", .start = IRQ_IXP4XX_GPIO12, .end = IRQ_IXP4XX_GPIO12, -@@ -133,21 +210,237 @@ +@@ -133,21 +210,237 @@ static struct platform_device avila_pata .resource = avila_pata_resources, }; @@ -392,7 +388,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1); avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1); -@@ -159,8 +452,335 @@ +@@ -159,8 +452,335 @@ static void __init avila_init(void) avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2; platform_device_register(&avila_pata); |