qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

[brcm63xx] refresh kernel patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11201 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg
2008-05-19 08:33:22 +00:00
parent 17bba1a8f6
commit f2a91858ac
14 changed files with 223 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
View File

@@ -17,10 +17,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
include/asm-mips/mach-bcm963xx/board.h | 2 ++
4 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/arch/mips/bcm963xx/setup.c b/arch/mips/bcm963xx/setup.c
index 982cba0..c12c9c3 100644
--- a/arch/mips/bcm963xx/setup.c
+++ b/arch/mips/bcm963xx/setup.c
Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c
+++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c
@@ -43,6 +43,7 @@
#include <asm/bootinfo.h>
#include <asm/cpu.h>
@@ -41,11 +41,11 @@ index 982cba0..c12c9c3 100644
+ mpi_init();
+ }
}
diff --git a/arch/mips/bcm963xx/time.c b/arch/mips/bcm963xx/time.c
index 75f751a..22ad56d 100644
--- a/arch/mips/bcm963xx/time.c
+++ b/arch/mips/bcm963xx/time.c
@@ -39,6 +39,8 @@
Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
+++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
@@ -40,6 +40,8 @@
#include <6348_intr.h>
#include <bcm_map_part.h>
#include <bcm_intr.h>
@@ -54,7 +54,7 @@ index 75f751a..22ad56d 100644
/*
* calculateCpuSpeed()
@@ -62,11 +64,12 @@ static inline unsigned long __init calculateCpuSpeed(void)
@@ -63,11 +65,12 @@ static inline unsigned long __init calcu
}
@@ -68,10 +68,10 @@ index 75f751a..22ad56d 100644
printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000,
(cpu_clock % 1000000) * 100 / 1000000);
diff --git a/arch/mips/pci/pci-bcm96348.c b/arch/mips/pci/pci-bcm96348.c
index bea3b7b..1e82283 100644
--- a/arch/mips/pci/pci-bcm96348.c
+++ b/arch/mips/pci/pci-bcm96348.c
Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/pci/pci-bcm96348.c
+++ linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
@@ -21,6 +21,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
@@ -81,21 +81,22 @@ index bea3b7b..1e82283 100644
#include <bcmpci.h>
static struct resource bcm_pci_io_resource = {
@@ -47,16 +49,19 @@ struct pci_controller bcm96348_controller = {
@@ -47,16 +49,19 @@ struct pci_controller bcm96348_controlle
static __init int bcm96348_pci_init(void)
{
- /* Avoid ISA compat ranges. */
- PCIBIOS_MIN_IO = 0x00000000;
- PCIBIOS_MIN_MEM = 0x00000000;
-
- /* Set I/O resource limits. */
- ioport_resource.end = 0x1fffffff;
- iomem_resource.end = 0xffffffff;
+ if (!ISBCM(0x6345)) {
+ /* Avoid ISA compat ranges. */
+ PCIBIOS_MIN_IO = 0x00000000;
+ PCIBIOS_MIN_MEM = 0x00000000;
- /* Set I/O resource limits. */
- ioport_resource.end = 0x1fffffff;
- iomem_resource.end = 0xffffffff;
+
+ /* Set I/O resource limits. */
+ ioport_resource.end = 0x1fffffff;
+ iomem_resource.end = 0xffffffff;
@@ -109,10 +110,10 @@ index bea3b7b..1e82283 100644
}
arch_initcall(bcm96348_pci_init);
diff --git a/include/asm-mips/mach-bcm963xx/board.h b/include/asm-mips/mach-bcm963xx/board.h
index e674cb1..73fa924 100644
--- a/include/asm-mips/mach-bcm963xx/board.h
+++ b/include/asm-mips/mach-bcm963xx/board.h
Index: linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/mach-bcm963xx/board.h
+++ linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h
@@ -369,5 +369,7 @@ void kerSysWakeupMonitorTask( void );
extern int boot_loader_type;
@@ -121,6 +122,3 @@ index e674cb1..73fa924 100644
+
#endif /* _BOARD_H */
--
1.5.5.1