X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1977b8eebdbc49bb7b46389a0e637b6fbbae2704..3e2425b2336ea78e199c342dbb3d706bbc03a030:/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch

diff --git a/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch b/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
index 2aebb2929..dd55cd163 100644
--- a/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
@@ -17,8 +17,6 @@ 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
 @@ -43,6 +43,7 @@
@@ -29,7 +27,7 @@ index 982cba0..c12c9c3 100644
  
  extern void brcm_time_init(void);
  extern int boot_loader_type;
-@@ -465,6 +466,9 @@ void __init plat_mem_setup(void)
+@@ -465,6 +466,9 @@
  	_machine_halt = brcm_machine_halt;
  	pm_power_off = brcm_machine_halt;
  
@@ -41,11 +39,9 @@ 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 @@
+@@ -40,6 +40,8 @@
  #include <6348_intr.h>
  #include <bcm_map_part.h>
  #include <bcm_intr.h>
@@ -54,7 +50,7 @@ index 75f751a..22ad56d 100644
  
  /*
   * calculateCpuSpeed()
-@@ -62,11 +64,12 @@ static inline unsigned long __init calculateCpuSpeed(void)
+@@ -63,11 +65,12 @@
  }
  
  
@@ -68,8 +64,6 @@ 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
 @@ -21,6 +21,8 @@
@@ -81,21 +75,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 @@
  
  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,11 +104,9 @@ 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
-@@ -369,5 +369,7 @@ void kerSysWakeupMonitorTask( void );
+@@ -369,5 +369,7 @@
  
  extern int boot_loader_type;
  
@@ -121,6 +114,3 @@ index e674cb1..73fa924 100644
 +
  #endif /* _BOARD_H */
  
--- 
-1.5.5.1
-