update zd1211 to r83, fix build on 2.6.19

[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 533418d..3b8b259 100644 (file)
--- a/target/linux/brcm63xx-2.6/patches/001-bcm963xx.patch
+++ b/target/linux/brcm63xx-2.6/patches/001-bcm963xx.patch
@@ -586,8 +586,8 @@ diff -urN linux.old/arch/mips/bcm963xx/bcm63xx_led.c linux.dev/arch/mips/bcm963x
 +
 diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/board.c
 --- linux.old/arch/mips/bcm963xx/board.c       1970-01-01 01:00:00.000000000 +0100
 +
 diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/board.c
 --- linux.old/arch/mips/bcm963xx/board.c       1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/bcm963xx/board.c       2006-08-25 15:16:26.000000000 +0200
-@@ -0,0 +1,555 @@
++++ linux.dev/arch/mips/bcm963xx/board.c       2006-08-27 21:02:04.000000000 +0200
+@@ -0,0 +1,559 @@

 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 
 +/*
 +<:copyright-gpl 
 + Copyright 2002 Broadcom Corp. All Rights Reserved. 


@@ -710,7 +710,7 @@ diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/boar
 +
 +/* DyingGasp function prototype */
 +static void __init kerSysDyingGaspMapIntr(void);
 +
 +/* DyingGasp function prototype */
 +static void __init kerSysDyingGaspMapIntr(void);

-+static irqreturn_t kerSysDyingGaspIsr(int irq, void * dev_id, struct pt_regs * regs);
++static irqreturn_t kerSysDyingGaspIsr(int irq, void * dev_id);

 +static void __init kerSysInitDyingGaspHandler( void );
 +static void __exit kerSysDeinitDyingGaspHandler( void );
 +/* -DyingGasp function prototype - */
 +static void __init kerSysInitDyingGaspHandler( void );
 +static void __exit kerSysDeinitDyingGaspHandler( void );
 +/* -DyingGasp function prototype - */


@@ -760,17 +760,21 @@ diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/boar
 +    /* CMO -- Fix le problème avec les adresses mac que l'on n'arrive pas
 +     *  * à relire plusieurs fois */
 +    /* inv_xde */
 +    /* CMO -- Fix le problème avec les adresses mac que l'on n'arrive pas
 +     *  * à relire plusieurs fois */
 +    /* inv_xde */

++#if 0

 +    if (boot_loader_type == BOOT_CFE)
 +      memcpy( pucaMacAddr, g_pNvramInfo->ucaBaseMacAddr,
 +              NVRAM_MAC_ADDRESS_LEN );
 +    else {
 +    if (boot_loader_type == BOOT_CFE)
 +      memcpy( pucaMacAddr, g_pNvramInfo->ucaBaseMacAddr,
 +              NVRAM_MAC_ADDRESS_LEN );
 +    else {

++#endif

 +      pucaMacAddr[0] = 0x00;
 +      pucaMacAddr[1] = 0x07;
 +      pucaMacAddr[2] = 0x3A;
 +      pucaMacAddr[3] = 0xFF;
 +      pucaMacAddr[4] = 0xFF;
 +      pucaMacAddr[5] = 0xFF;
 +      pucaMacAddr[0] = 0x00;
 +      pucaMacAddr[1] = 0x07;
 +      pucaMacAddr[2] = 0x3A;
 +      pucaMacAddr[3] = 0xFF;
 +      pucaMacAddr[4] = 0xFF;
 +      pucaMacAddr[5] = 0xFF;

++#if 0

 +    }
 +    }

++#endif

 +
 +    return nRet;
 +} /* kerSysGetMacAddr */
 +
 +    return nRet;
 +} /* kerSysGetMacAddr */


@@ -978,7 +982,7 @@ diff -urN linux.old/arch/mips/bcm963xx/board.c linux.dev/arch/mips/bcm963xx/boar
 +}
 +
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
 +}
 +
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))

-+static irqreturn_t kerSysDyingGaspIsr(int irq, void * dev_id, struct pt_regs * regs)
++static irqreturn_t kerSysDyingGaspIsr(int irq, void * dev_id)

 +#else
 +static unsigned int kerSysDyingGaspIsr(void)
 +#endif
 +#else
 +static unsigned int kerSysDyingGaspIsr(void)
 +#endif


@@ -5573,7 +5577,7 @@ diff -urN linux.old/arch/mips/bcm963xx/include/bcm_intr.h linux.dev/arch/mips/bc
 +
 +/* defines */
 +struct pt_regs;
 +
 +/* defines */
 +struct pt_regs;

-+typedef int (*FN_HANDLER) (int, void *, struct pt_regs *);
++typedef int (*FN_HANDLER) (int, void *);

 +
 +/* prototypes */
 +extern void enable_brcm_irq(unsigned int irq);
 +
 +/* prototypes */
 +extern void enable_brcm_irq(unsigned int irq);


@@ -6450,7 +6454,7 @@ diff -urN linux.old/arch/mips/bcm963xx/int-handler.S linux.dev/arch/mips/bcm963x
 + * Generic interrupt handler for Broadcom MIPS boards
 + */
 +
 + * Generic interrupt handler for Broadcom MIPS boards
 + */
 +

-+#include <linux/config.h>
++#include <linux/autoconf.h>

 +
 +#include <asm/asm.h>
 +#include <asm/mipsregs.h>
 +
 +#include <asm/asm.h>
 +#include <asm/mipsregs.h>


@@ -6551,13 +6555,13 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +      }
 +      if (pendingIrqs & irqBit) {
 +                      PERF->IrqMask &= ~irqBit; // mask
 +      }
 +      if (pendingIrqs & irqBit) {
 +                      PERF->IrqMask &= ~irqBit; // mask

-+                      do_IRQ(isrNumber + INTERNAL_ISR_TABLE_OFFSET, regs);
++                      do_IRQ(isrNumber + INTERNAL_ISR_TABLE_OFFSET);

 +              break;
 +      }
 +      }
 +}
 +
 +              break;
 +      }
 +      }
 +}
 +

-+static void irq_dispatch_ext(uint32 irq, struct pt_regs *regs)
++static void irq_dispatch_ext(uint32 irq)

 +{
 +      if (!(PERF->ExtIrqCfg & (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT)))) {
 +      printk("**** Ext IRQ mask. Should not dispatch ****\n");
 +{
 +      if (!(PERF->ExtIrqCfg & (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT)))) {
 +      printk("**** Ext IRQ mask. Should not dispatch ****\n");


@@ -6565,7 +6569,7 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +      /* disable and clear interrupt in the controller */
 +      PERF->ExtIrqCfg |= (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_CLEAR_SHFT));
 +      PERF->ExtIrqCfg &= ~(1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT));
 +      /* disable and clear interrupt in the controller */
 +      PERF->ExtIrqCfg |= (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_CLEAR_SHFT));
 +      PERF->ExtIrqCfg &= ~(1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT));

-+      do_IRQ(irq, regs);
++      do_IRQ(irq);

 +}
 +
 +
 +}
 +
 +


@@ -6580,13 +6584,13 @@ diff -urN linux.old/arch/mips/bcm963xx/irq.c linux.dev/arch/mips/bcm963xx/irq.c
 +              else if (cause & CAUSEF_IP2)
 +                      irq_dispatch_int(regs);
 +              else if (cause & CAUSEF_IP3)
 +              else if (cause & CAUSEF_IP2)
 +                      irq_dispatch_int(regs);
 +              else if (cause & CAUSEF_IP3)

-+                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_0, regs);
++                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_0);

 +              else if (cause & CAUSEF_IP4)
 +              else if (cause & CAUSEF_IP4)

-+                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_1, regs);
++                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_1);

 +              else if (cause & CAUSEF_IP5)
 +              else if (cause & CAUSEF_IP5)

-+                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_2, regs);
++                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_2);

 +              else if (cause & CAUSEF_IP6)
 +              else if (cause & CAUSEF_IP6)

-+                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3, regs);
++                      irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3);

 +              local_irq_disable();
 +      }
 +}
 +              local_irq_disable();
 +      }
 +}


@@ -6754,7 +6758,7 @@ diff -urN linux.old/arch/mips/bcm963xx/Kconfig linux.dev/arch/mips/bcm963xx/Kcon
 +# Kernel and Driver configuration for Broadcom Commengine ADSL board
 +choice
 +      prompt "Broadcom Commengine ADSL board"
 +# Kernel and Driver configuration for Broadcom Commengine ADSL board
 +choice
 +      prompt "Broadcom Commengine ADSL board"

-+      depends on MIPS_BRCM
++      depends on BCM963XX

 +      default BCM96345
 +      help
 +        Select different Broadcom ADSL board
 +      default BCM96345
 +      help
 +        Select different Broadcom ADSL board


@@ -6916,26 +6920,26 @@ diff -urN linux.old/arch/mips/bcm963xx/Makefile linux.dev/arch/mips/bcm963xx/Mak
 +EXTRA_CFLAGS += -DADSL_ANNEXC
 +endif
 +
 +EXTRA_CFLAGS += -DADSL_ANNEXC
 +endif
 +

-diff -urN linux.old/arch/mips/bcm963xx/prom.c linux.dev/arch/mips/bcm963xx/prom.c
---- linux.old/arch/mips/bcm963xx/prom.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm963xx/prom.c        2006-08-25 01:49:57.000000000 +0200
-@@ -0,0 +1,128 @@
+diff -urN linux-2.6.17/arch/mips/bcm963xx/prom.c linux-2.6.17-brcm63xx/arch/mips/bcm963xx/prom.c
+--- linux-2.6.17/arch/mips/bcm963xx/prom.c      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.17-brcm63xx/arch/mips/bcm963xx/prom.c     2006-08-29 07:10:10.000000000 +0200
+@@ -0,0 +1,143 @@

 +/*
 +/*

-+<:copyright-gpl 
-+ Copyright 2004 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
++<:copyright-gpl
++ Copyright 2004 Broadcom Corp. All Rights Reserved.
++
++ This program is free software; you can distribute it and/or modify it
++ under the terms of the GNU General Public License (Version 2) as
++ published by the Free Software Foundation.
++
++ This program is distributed in the hope it will be useful, but WITHOUT
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ for more details.
++
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, write to the Free Software Foundation, Inc.,
++ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

 +:>
 +*/
 +/*
 +:>
 +*/
 +/*


@@ -6961,6 +6965,8 @@ diff -urN linux.old/arch/mips/bcm963xx/prom.c linux.dev/arch/mips/bcm963xx/prom.
 +//char arcs_cmdline[CL_SIZE] __initdata = {0};
 +/* inv_xde */
 +int boot_loader_type;
 +//char arcs_cmdline[CL_SIZE] __initdata = {0};
 +/* inv_xde */
 +int boot_loader_type;

++int prom_argc;
++char **prom_argv, **prom_envp;

 +
 +extern int  do_syslog(int, char *, int);
 +extern void serial_init(void);
 +
 +extern int  do_syslog(int, char *, int);
 +extern void serial_init(void);


@@ -7018,9 +7024,20 @@ diff -urN linux.old/arch/mips/bcm963xx/prom.c linux.dev/arch/mips/bcm963xx/prom.
 +
 +    serial_init();
 +
 +
 +    serial_init();
 +

-+    /* Need to fixup boot loader detection code 
-+     * whithout changing prom_init prototype  
-+     */
++    prom_argc = fw_arg0;
++    prom_argv = (char **) fw_arg1;
++    prom_envp = (char **) fw_arg2;
++
++    if ((prom_argv > 0x80000000) && (prom_argv < 0x82000000)) {
++      strncpy(arcs_cmdline, prom_argv[1], CL_SIZE);
++    }
++
++    if (strncmp(arcs_cmdline, "boot_loader=RedBoot", 19) != 0) {
++      boot_loader_type =  BOOT_CFE;
++    }
++    else {
++      boot_loader_type = BOOT_REDBOOT;
++    }

 +
 +    do_syslog(8, NULL, 8);
 +
 +
 +    do_syslog(8, NULL, 8);
 +


@@ -7030,18 +7047,20 @@ diff -urN linux.old/arch/mips/bcm963xx/prom.c linux.dev/arch/mips/bcm963xx/prom.
 +
 +    arcs_cmdline[0] = '\0';
 +
 +
 +    arcs_cmdline[0] = '\0';
 +

-+      if (boot_loader_type == BOOT_CFE)
++       if (boot_loader_type == BOOT_CFE)

 +      add_memory_region(0, (getMemorySize() - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
 +    else
 +      add_memory_region(0, (getMemorySize() - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
 +    else

-+      add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
++       add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);

 +
 +    mips_machgroup = MACH_GROUP_BRCM;
 +    mips_machtype = MACH_BCM;
 +
 +    mips_machgroup = MACH_GROUP_BRCM;
 +    mips_machtype = MACH_BCM;

++
++       BpSetBoardId("96348GW-10");

 +}
 +
 +/* --------------------------------------------------------------------------
 +    Name: prom_free_prom_memory
 +}
 +
 +/* --------------------------------------------------------------------------
 +    Name: prom_free_prom_memory

-+Abstract: 
++Abstract:

 + -------------------------------------------------------------------------- */
 +void __init prom_free_prom_memory(void)
 +{
 + -------------------------------------------------------------------------- */
 +void __init prom_free_prom_memory(void)
 +{


@@ -7076,7 +7095,7 @@ diff -urN linux.old/arch/mips/bcm963xx/ser_init.c linux.dev/arch/mips/bcm963xx/s
 + *   
 + */
 +
 + *   
 + */
 +

-+#include <linux/config.h>
++#include <linux/autoconf.h>

 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>


@@ -7258,7 +7277,7 @@ diff -urN linux.old/arch/mips/bcm963xx/setup.c linux.dev/arch/mips/bcm963xx/setu
 + * Generic setup routines for Broadcom 963xx MIPS boards
 + */
 +
 + * Generic setup routines for Broadcom 963xx MIPS boards
 + */
 +

-+#include <linux/config.h>
++#include <linux/autoconf.h>

 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>


@@ -7793,7 +7812,7 @@ diff -urN linux.old/arch/mips/bcm963xx/time.c linux.dev/arch/mips/bcm963xx/time.
 + * Setup time for Broadcom 963xx MIPS boards
 + */
 +
 + * Setup time for Broadcom 963xx MIPS boards
 + */
 +

-+#include <linux/config.h>
++#include <linux/autoconf.h>

 +#include <linux/init.h>
 +#include <linux/kernel_stat.h>
 +#include <linux/sched.h>
 +#include <linux/init.h>
 +#include <linux/kernel_stat.h>
 +#include <linux/sched.h>


@@ -7892,7 +7911,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
        prompt "System type"
        default SGI_IP22
  
        prompt "System type"
        default SGI_IP22
  

-+config MIPS_BRCM
++config BCM963XX 

 +      bool "Support for the Broadcom boards"
 +      select SYS_SUPPORTS_32BIT_KERNEL
 +      select SYS_SUPPORTS_BIG_ENDIAN
 +      bool "Support for the Broadcom boards"
 +      select SYS_SUPPORTS_32BIT_KERNEL
 +      select SYS_SUPPORTS_BIG_ENDIAN


@@ -7973,10 +7992,10 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
  #
 +# Broadcom board
 +#
  #
 +# Broadcom board
 +#

-+core-$(CONFIG_MIPS_BRCM)      += arch/mips/bcm963xx/
-+cflags-$(CONFIG_MIPS_BRCM)            += -Iinclude/asm-mips/mach-bcm963xx
-+cflags-$(CONFIG_MIPS_BRCM)            += -Iarch/mips/bcm963xx/include
-+load-$(CONFIG_MIPS_BRCM)      += 0xffffffff80010000
++core-$(CONFIG_BCM963XX)       += arch/mips/bcm963xx/
++cflags-$(CONFIG_BCM963XX)             += -Iinclude/asm-mips/mach-bcm963xx
++cflags-$(CONFIG_BCM963XX)             += -Iarch/mips/bcm963xx/include
++load-$(CONFIG_BCM963XX)       += 0xffffffff80010000

 +
 +
 +#
 +
 +
 +#


@@ -8013,26 +8032,26 @@ diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
                tlbw(p);
                break;
  
                tlbw(p);
                break;
  

-diff -urN linux.old/arch/mips/pci/fixup-bcm96348.c linux.dev/arch/mips/pci/fixup-bcm96348.c
---- linux.old/arch/mips/pci/fixup-bcm96348.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/pci/fixup-bcm96348.c   2006-08-25 00:39:38.000000000 +0200
-@@ -0,0 +1,85 @@
+diff -urN linux-2.6.17/arch/mips/pci/fixup-bcm96348.c linux-2.6.17-brcm63xx/arch/mips/pci/fixup-bcm96348.c
+--- linux-2.6.17/arch/mips/pci/fixup-bcm96348.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.17-brcm63xx/arch/mips/pci/fixup-bcm96348.c        2006-08-29 10:25:22.000000000 +0200
+@@ -0,0 +1,93 @@

 +/*
 +/*

-+<:copyright-gpl 
-+ Copyright 2002 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
++<:copyright-gpl
++ Copyright 2002 Broadcom Corp. All Rights Reserved.
++
++ This program is free software; you can distribute it and/or modify it
++ under the terms of the GNU General Public License (Version 2) as
++ published by the Free Software Foundation.
++
++ This program is distributed in the hope it will be useful, but WITHOUT
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ for more details.
++
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, write to the Free Software Foundation, Inc.,
++ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

 +:>
 +*/
 +#include <linux/init.h>
 +:>
 +*/
 +#include <linux/init.h>


@@ -8072,10 +8091,10 @@ diff -urN linux.old/arch/mips/pci/fixup-bcm96348.c linux.dev/arch/mips/pci/fixup
 +            // Memory Window 1. Mask determines which bits are decoded.
 +            mpi->l2pmrange1 = ~(size-1);
 +            // UBUS to PCI Memory base address. This is akin to the ChipSelect base
 +            // Memory Window 1. Mask determines which bits are decoded.
 +            mpi->l2pmrange1 = ~(size-1);
 +            // UBUS to PCI Memory base address. This is akin to the ChipSelect base

-+            // register. 
++            // register.

 +            mpi->l2pmbase1 = memaddr & BCM_PCI_ADDR_MASK;
 +            // UBUS to PCI Remap Address. Replaces the masked address bits in the
 +            mpi->l2pmbase1 = memaddr & BCM_PCI_ADDR_MASK;
 +            // UBUS to PCI Remap Address. Replaces the masked address bits in the

-+            // range register with this setting. 
++            // range register with this setting.

 +            // Also, enable direct I/O and direct Memory accesses
 +            mpi->l2pmremap1 = (memaddr | MEM_WINDOW_EN);
 +            break;
 +            // Also, enable direct I/O and direct Memory accesses
 +            mpi->l2pmremap1 = (memaddr | MEM_WINDOW_EN);
 +            break;


@@ -8083,7 +8102,7 @@ diff -urN linux.old/arch/mips/pci/fixup-bcm96348.c linux.dev/arch/mips/pci/fixup
 +        case 1:
 +            // Memory Window 2
 +            mpi->l2pmrange2 = ~(size-1);
 +        case 1:
 +            // Memory Window 2
 +            mpi->l2pmrange2 = ~(size-1);

-+            // UBUS to PCI Memory base address. 
++            // UBUS to PCI Memory base address.

 +            mpi->l2pmbase2 = memaddr & BCM_PCI_ADDR_MASK;
 +            // UBUS to PCI Remap Address
 +            mpi->l2pmremap2 = (memaddr | MEM_WINDOW_EN);
 +            mpi->l2pmbase2 = memaddr & BCM_PCI_ADDR_MASK;
 +            // UBUS to PCI Remap Address
 +            mpi->l2pmremap2 = (memaddr | MEM_WINDOW_EN);


@@ -8098,10 +8117,18 @@ diff -urN linux.old/arch/mips/pci/fixup-bcm96348.c linux.dev/arch/mips/pci/fixup
 +    }
 +}
 +
 +    }
 +}
 +

-+struct pci_fixup pcibios_fixups[] = {
++int pcibios_plat_dev_init(struct pci_dev *dev)
++{
++        return 0;
++}
++
++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, PCI_ANY_ID,
++          bcm96348_fixup);
++
++/*struct pci_fixup pcibios_fixups[] = {

 +    { PCI_FIXUP_FINAL, PCI_ANY_ID, PCI_ANY_ID, bcm96348_fixup },
 +    {0}
 +    { PCI_FIXUP_FINAL, PCI_ANY_ID, PCI_ANY_ID, bcm96348_fixup },
 +    {0}

-+};
++};*/

 diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
 --- linux.old/arch/mips/pci/Makefile   2006-08-25 00:43:29.000000000 +0200
 +++ linux.dev/arch/mips/pci/Makefile   2006-08-25 00:39:38.000000000 +0200
 diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
 --- linux.old/arch/mips/pci/Makefile   2006-08-25 00:43:29.000000000 +0200
 +++ linux.dev/arch/mips/pci/Makefile   2006-08-25 00:39:38.000000000 +0200


@@ -8393,26 +8420,26 @@ diff -urN linux.old/arch/mips/pci/ops-bcm96348.c linux.dev/arch/mips/pci/ops-bcm
 +    .read   = bcm96348_pcibios_read,
 +    .write  = bcm96348_pcibios_write
 +};
 +    .read   = bcm96348_pcibios_read,
 +    .write  = bcm96348_pcibios_write
 +};

-diff -urN linux.old/arch/mips/pci/pci-bcm96348.c linux.dev/arch/mips/pci/pci-bcm96348.c
---- linux.old/arch/mips/pci/pci-bcm96348.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/pci/pci-bcm96348.c     2006-08-25 00:39:38.000000000 +0200
+diff -urN linux-2.6.17/arch/mips/pci/pci-bcm96348.c linux-2.6.17-brcm63xx/arch/mips/pci/pci-bcm96348.c
+--- linux-2.6.17/arch/mips/pci/pci-bcm96348.c   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.17-brcm63xx/arch/mips/pci/pci-bcm96348.c  2006-08-29 10:25:13.000000000 +0200

 @@ -0,0 +1,54 @@
 +/*
 @@ -0,0 +1,54 @@
 +/*

-+<:copyright-gpl 
-+ Copyright 2002 Broadcom Corp. All Rights Reserved. 
-+ 
-+ This program is free software; you can distribute it and/or modify it 
-+ under the terms of the GNU General Public License (Version 2) as 
-+ published by the Free Software Foundation. 
-+ 
-+ This program is distributed in the hope it will be useful, but WITHOUT 
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-+ for more details. 
-+ 
-+ You should have received a copy of the GNU General Public License along 
-+ with this program; if not, write to the Free Software Foundation, Inc., 
-+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 
++<:copyright-gpl
++ Copyright 2002 Broadcom Corp. All Rights Reserved.
++
++ This program is free software; you can distribute it and/or modify it
++ under the terms of the GNU General Public License (Version 2) as
++ published by the Free Software Foundation.
++
++ This program is distributed in the hope it will be useful, but WITHOUT
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ for more details.
++
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, write to the Free Software Foundation, Inc.,
++ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

 +:>
 +*/
 +#include <linux/types.h>
 +:>
 +*/
 +#include <linux/types.h>


@@ -8420,7 +8447,7 @@ diff -urN linux.old/arch/mips/pci/pci-bcm96348.c linux.dev/arch/mips/pci/pci-bcm
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +

-+#include <asm/pci_channel.h>
++//#include <asm/pci_channel.h>

 +#include <bcmpci.h>
 +
 +static struct resource bcm_pci_io_resource = {
 +#include <bcmpci.h>
 +
 +static struct resource bcm_pci_io_resource = {


@@ -8440,9 +8467,9 @@ diff -urN linux.old/arch/mips/pci/pci-bcm96348.c linux.dev/arch/mips/pci/pci-bcm
 +extern struct pci_ops bcm96348_pci_ops;
 +
 +struct pci_controller bcm96348_controller = {
 +extern struct pci_ops bcm96348_pci_ops;
 +
 +struct pci_controller bcm96348_controller = {

-+    .pci_ops  = &bcm96348_pci_ops,
-+    .io_resource      = &bcm_pci_io_resource,
-+    .mem_resource     = &bcm_pci_mem_resource,
++    .pci_ops   = &bcm96348_pci_ops,
++    .io_resource       = &bcm_pci_io_resource,
++    .mem_resource      = &bcm_pci_mem_resource,

 +};
 +
 +static void bcm96348_pci_init(void)
 +};
 +
 +static void bcm96348_pci_init(void)


@@ -8705,7 +8732,7 @@ diff -urN linux.old/drivers/serial/bcm63xx_cons.c linux.dev/drivers/serial/bcm63
 + * ------------------------------------------------------------
 + */
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 + * ------------------------------------------------------------
 + */
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)

-+static irqreturn_t bcm_interrupt (int irq, void * dev, struct pt_regs * regs)
++static irqreturn_t bcm_interrupt (int irq, void * dev)

 +#else
 +static void bcm_interrupt (int irq, void * dev, struct pt_regs * regs)
 +#endif
 +#else
 +static void bcm_interrupt (int irq, void * dev, struct pt_regs * regs)
 +#endif


@@ -9626,3 +9653,4 @@ diff -urN linux.old/include/asm-mips/module.h linux.dev/include/asm-mips/module.
  #else
  #error MODULE_PROC_FAMILY undefined for your processor configuration
  #endif
  #else
  #error MODULE_PROC_FAMILY undefined for your processor configuration
  #endif

+