fix up remaining parts for the brcm47xx-2.6 port (tested on wgt634u), nuke the old...

[openwrt.git] / target / linux / brcm63xx-2.6 / patches / 001-bcm963xx.patch

diff --git a/target/linux/brcm63xx-2.6/patches/001-bcm963xx.patch b/target/linux/brcm63xx-2.6/patches/001-bcm963xx.patch
index f7597dc..2a33b69 100644 (file)
--- a/target/linux/brcm63xx-2.6/patches/001-bcm963xx.patch
+++ b/target/linux/brcm63xx-2.6/patches/001-bcm963xx.patch
@@ -52,7 +52,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/Kconfig linux-2.6.19.new/arch/mips/bcm
 +choice
 +      prompt "Broadcom Commengine ADSL board"
 +      depends on BCM963XX
-+      default BCM96345
++      default BCM96348
 +      help
 +        Select different Broadcom ADSL board
 +
@@ -6899,7 +6899,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/irq.c linux-2.6.19.new/arch/mips/bcm96
 +              irq_desc[i].status = IRQ_DISABLED;
 +              irq_desc[i].action = 0;
 +              irq_desc[i].depth = 1;
-+              irq_desc[i].handler_data = &brcm_irq_type;
++              irq_desc[i].chip = &brcm_irq_type;
 +      }
 +}
 +
@@ -6941,7 +6941,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/irq.c linux-2.6.19.new/arch/mips/bcm96
 +       * explicitly call BcmHalInterruptEnable or enable_brcm_irq.  This behavior
 +       * is consistent with interrupt handling on VxWorks.
 +       */
-+      irq_desc[interruptId].handler_data = &brcm_irq_no_end_type;
++      irq_desc[interruptId].chip = &brcm_irq_no_end_type;
 +
 +      if( interruptId >= INTERNAL_ISR_TABLE_OFFSET )
 +      {
@@ -7297,7 +7297,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/ser_init.c linux-2.6.19.new/arch/mips/
 diff -urN linux-2.6.19/arch/mips/bcm963xx/setup.c linux-2.6.19.new/arch/mips/bcm963xx/setup.c
 --- linux-2.6.19/arch/mips/bcm963xx/setup.c    1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.19.new/arch/mips/bcm963xx/setup.c        2006-12-16 18:46:31.000000000 +0100
-@@ -0,0 +1,524 @@
+@@ -0,0 +1,523 @@
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
@@ -7341,7 +7341,6 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/setup.c linux-2.6.19.new/arch/mips/bcm
 +#include <asm/gdb-stub.h>
 +
 +extern void brcm_time_init(void);
-+extern void brcm_timer_setup(struct irqaction *irq);
 +extern unsigned long getMemorySize(void);
 +
 +#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI)
@@ -7831,7 +7830,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h linux-2.6.19.ne
 diff -urN linux-2.6.19/arch/mips/bcm963xx/time.c linux-2.6.19.new/arch/mips/bcm963xx/time.c
 --- linux-2.6.19/arch/mips/bcm963xx/time.c     1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.19.new/arch/mips/bcm963xx/time.c 2006-12-16 18:46:31.000000000 +0100
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,114 @@
 +/*
 +<:copyright-gpl
 + Copyright 2004 Broadcom Corp. All Rights Reserved.
@@ -7940,17 +7939,12 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/time.c linux-2.6.19.new/arch/mips/bcm9
 +}
 +
 +
-+void __init brcm_timer_setup(struct irqaction *irq)
++void __init plat_timer_setup(struct irqaction *irq)
 +{
 +      r4k_cur = (read_c0_count() + r4k_offset);
 +      write_c0_compare(r4k_cur);
 +      set_c0_status(IE_IRQ5);
 +}
-+
-+void __init plat_timer_setup(struct irqaction *irq)
-+{
-+       brcm_timer_setup(irq);
-+}
 diff -urN linux-2.6.19/arch/mips/kernel/cpu-probe.c linux-2.6.19.new/arch/mips/kernel/cpu-probe.c
 --- linux-2.6.19/arch/mips/kernel/cpu-probe.c  2006-11-29 22:57:37.000000000 +0100
 +++ linux-2.6.19.new/arch/mips/kernel/cpu-probe.c      2006-12-16 18:46:31.000000000 +0100