[kernel] fix gpiommc driver on 2.6.26 (closes #4129)

[openwrt.git] / target / linux / brcm63xx / patches-2.6.25 / 100-bcm963xx_add_new_timer_code.patch

diff --git a/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch b/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch
index dc4f57f..9d08ab0 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch
@@ -12,11 +12,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  arch/mips/bcm963xx/time.c |   64 ++++++++++++++++++++------------------------
  2 files changed, 31 insertions(+), 35 deletions(-)
 
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 1b1c4bf..3f8be3f 100644
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -67,6 +67,8 @@ config BCM963XX
+@@ -67,6 +67,8 @@
         select HW_HAS_PCI
         select DMA_NONCOHERENT
         select IRQ_CPU
@@ -25,8 +23,6 @@ index 1b1c4bf..3f8be3f 100644
         help
           This is a fmaily of boards based on the Broadcom MIPS32
  
-diff --git a/arch/mips/bcm963xx/time.c b/arch/mips/bcm963xx/time.c
-index 8a5007e..9fae8fd 100644
 --- a/arch/mips/bcm963xx/time.c
 +++ b/arch/mips/bcm963xx/time.c
 @@ -1,6 +1,7 @@
@@ -97,12 +93,13 @@ index 8a5007e..9fae8fd 100644
 +
 +      printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000,
 +              (cpu_clock % 1000000) * 100 / 1000000);
++
++      mips_hpt_frequency = cpu_clock / 2;
  
 -      printk("calculating r4koff... ");
 -      r4k_offset = cal_r4koff();
 -      printk("%08lx(%d)\n", r4k_offset, (int)r4k_offset);
-+      mips_hpt_frequency = cpu_clock / 2;
- 
+-
 -      est_freq = 2 * r4k_offset * HZ;
 -      est_freq += 5000;   /* round */
 -      est_freq -= est_freq % 10000;
@@ -116,6 +113,3 @@ index 8a5007e..9fae8fd 100644
 +      write_c0_count(0);
 +      write_c0_compare(0xffff);
  }
--- 
-1.5.5.1
-