domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ixp4xx: sync 2.6.33 patches against 2.6.33.6

Browse Source 
SVN-Revision: 22248
This commit is contained in:
Alexandros C. Couloumbis
2010-07-17 13:22:32 +00:00
parent 9a4ca45096
commit 472585ce4a
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/ixp4xx/patches-2.6.33/010-ixp43x_pci_fixup.patch
View File

@@ -1,11 +0,0 @@
--- a/arch/arm/mach-ixp4xx/include/mach/hardware.h
+++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h
@@ -18,7 +18,7 @@
#define __ASM_ARCH_HARDWARE_H__
#define PCIBIOS_MIN_IO 0x00001000
-#define PCIBIOS_MIN_MEM (cpu_is_ixp43x() ? 0x40000000 : 0x48000000)
+#define PCIBIOS_MIN_MEM 0x48000000
/*
* We override the standard dma-mask routines for bouncing.

20
target/linux/ixp4xx/patches-2.6.33/401-avila_pci_dev.patch
View File

@@ -1,11 +1,11 @@
--- a/arch/arm/mach-ixp4xx/include/mach/avila.h
+++ b/arch/arm/mach-ixp4xx/include/mach/avila.h
@@ -25,7 +25,7 @@
/*
* AVILA PCI IRQs
*/
-#define AVILA_PCI_MAX_DEV 4
+#define AVILA_PCI_MAX_DEV 6
#define LOFT_PCI_MAX_DEV 6
#define AVILA_PCI_IRQ_LINES 4
--- a/arch/arm/mach-ixp4xx/avila-pci.c
+++ b/arch/arm/mach-ixp4xx/avila-pci.c
@@ -27,7 +27,7 @@
#include <mach/hardware.h>
#include <asm/mach-types.h>
-#define AVILA_MAX_DEV 4
+#define AVILA_MAX_DEV 6
#define LOFT_MAX_DEV 6
#define IRQ_LINES 4