change config name of led driver

[openwrt.git] / target / linux / linux-2.4 / patches / ar7 / 000-ar7_support.patch

diff --git a/target/linux/linux-2.4/patches/ar7/000-ar7_support.patch b/target/linux/linux-2.4/patches/ar7/000-ar7_support.patch
index 109c858..61c60a8 100644 (file)
--- a/target/linux/linux-2.4/patches/ar7/000-ar7_support.patch
+++ b/target/linux/linux-2.4/patches/ar7/000-ar7_support.patch
@@ -1,7 +1,27 @@
-diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_jump.S linux.dev/arch/mips/ar7/avalanche/avalanche_jump.S
---- linux.old/arch/mips/ar7/avalanche/avalanche_jump.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/ar7/avalanche/avalanche_jump.S 2005-07-09 08:00:15.286026000 +0200
-@@ -0,0 +1,69 @@
+diff -urN linux.old/arch/mips/ar7/ar7/jump.S linux.dev/arch/mips/ar7/ar7/jump.S
+--- linux.old/arch/mips/ar7/ar7/jump.S 1970-01-01 01:00:00.000000000 +0100
++++ linux.dev/arch/mips/ar7/ar7/jump.S 2005-07-12 02:59:26.167672328 +0200
+@@ -0,0 +1,89 @@
++/*
++ * $Id$
++ * Copyright (C) $Date$  $Author$
++ * 
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ * 
++ * This program is distributed in the hope that 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ * 
++ */
++

 +#include <linux/config.h>
 +#include <linux/threads.h>
 +
 +#include <linux/config.h>
 +#include <linux/threads.h>
 +


@@ -71,15 +91,52 @@ diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_jump.S linux.dev/arch/mips
 +END(jump_dedicated_interrupt)
 +
 +      .set at
 +END(jump_dedicated_interrupt)
 +
 +      .set at

-diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_misc.c linux.dev/arch/mips/ar7/avalanche/avalanche_misc.c
---- linux.old/arch/mips/ar7/avalanche/avalanche_misc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/ar7/avalanche/avalanche_misc.c 2005-07-09 08:00:15.287026000 +0200
-@@ -0,0 +1,327 @@
+diff -urN linux.old/arch/mips/ar7/ar7/Makefile linux.dev/arch/mips/ar7/ar7/Makefile
+--- linux.old/arch/mips/ar7/ar7/Makefile       1970-01-01 01:00:00.000000000 +0100
++++ linux.dev/arch/mips/ar7/ar7/Makefile       2005-07-12 02:59:26.167672328 +0200
+@@ -0,0 +1,31 @@
++# $Id$
++# Copyright (C) $Date$  $Author$
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++
++.S.s:
++      $(CPP) $(AFLAGS) $< -o $*.s
++
++.S.o:
++      $(CC) $(AFLAGS) -c $< -o $*.o
++
++EXTRA_CFLAGS := -DLITTLE_ENDIAN -D_LINK_KSEG0_
++
++O_TARGET := ar7.o
++
++export-objs := misc.o
++obj-y += paging.o jump.o misc.o
++
++include $(TOPDIR)/Rules.make
+diff -urN linux.old/arch/mips/ar7/ar7/misc.c linux.dev/arch/mips/ar7/ar7/misc.c
+--- linux.old/arch/mips/ar7/ar7/misc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux.dev/arch/mips/ar7/ar7/misc.c 2005-07-12 02:59:26.168672176 +0200
+@@ -0,0 +1,319 @@

 +#include <asm/ar7/sangam.h>
 +#include <asm/ar7/avalanche_misc.h>
 +#include <linux/module.h>
 +#include <linux/spinlock.h>
 +
 +#include <asm/ar7/sangam.h>
 +#include <asm/ar7/avalanche_misc.h>
 +#include <linux/module.h>
 +#include <linux/spinlock.h>
 +

++#define TRUE 1
++

 +static unsigned int avalanche_vbus_freq;
 +
 +REMOTE_VLYNQ_DEV_RESET_CTRL_FN p_remote_vlynq_dev_reset_ctrl = NULL;
 +static unsigned int avalanche_vbus_freq;
 +
 +REMOTE_VLYNQ_DEV_RESET_CTRL_FN p_remote_vlynq_dev_reset_ctrl = NULL;


@@ -174,7 +231,6 @@ diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_misc.c linux.dev/arch/mips
 +                                           >> AVALANCHE_GLOBAL_POWER_DOWN_BIT));
 +}
 +
 +                                           >> AVALANCHE_GLOBAL_POWER_DOWN_BIT));
 +}
 +

-+#if defined (CONFIG_AVALANCHE_GENERIC_GPIO)

 +/*****************************************************************************
 + * GPIO  Control
 + *****************************************************************************/
 +/*****************************************************************************
 + * GPIO  Control
 + *****************************************************************************/


@@ -311,8 +367,6 @@ diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_misc.c linux.dev/arch/mips
 +    return (0);
 +}
 +
 +    return (0);
 +}
 +

-+#endif
-+

 +/***********************************************************************
 + *
 + *    Wakeup Control Module for TNETV1050 Communication Processor
 +/***********************************************************************
 + *
 + *    Wakeup Control Module for TNETV1050 Communication Processor


@@ -372,9 +426,6 @@ diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_misc.c linux.dev/arch/mips
 +    return(p_set_mdix_on_chip_fn ? 1:0);
 +}
 +
 +    return(p_set_mdix_on_chip_fn ? 1:0);
 +}
 +

-+/* software abstraction for HAL */
-+
-+

 +EXPORT_SYMBOL(avalanche_reset_ctrl);
 +EXPORT_SYMBOL(avalanche_get_reset_status);
 +EXPORT_SYMBOL(avalanche_sys_reset);
 +EXPORT_SYMBOL(avalanche_reset_ctrl);
 +EXPORT_SYMBOL(avalanche_get_reset_status);
 +EXPORT_SYMBOL(avalanche_sys_reset);


@@ -386,25 +437,21 @@ diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_misc.c linux.dev/arch/mips
 +EXPORT_SYMBOL(avalanche_set_mdix_on_chip);
 +EXPORT_SYMBOL(avalanche_is_mdix_on_chip);
 +
 +EXPORT_SYMBOL(avalanche_set_mdix_on_chip);
 +EXPORT_SYMBOL(avalanche_is_mdix_on_chip);
 +

-+
-+
-+#if defined (CONFIG_AVALANCHE_GENERIC_GPIO)

 +EXPORT_SYMBOL(avalanche_gpio_init);
 +EXPORT_SYMBOL(avalanche_gpio_ctrl);
 +EXPORT_SYMBOL(avalanche_gpio_out_bit);
 +EXPORT_SYMBOL(avalanche_gpio_in_bit);
 +EXPORT_SYMBOL(avalanche_gpio_out_value);
 +EXPORT_SYMBOL(avalanche_gpio_in_value);
 +EXPORT_SYMBOL(avalanche_gpio_init);
 +EXPORT_SYMBOL(avalanche_gpio_ctrl);
 +EXPORT_SYMBOL(avalanche_gpio_out_bit);
 +EXPORT_SYMBOL(avalanche_gpio_in_bit);
 +EXPORT_SYMBOL(avalanche_gpio_out_value);
 +EXPORT_SYMBOL(avalanche_gpio_in_value);

-+#endif

 +
 +EXPORT_SYMBOL(avalanche_set_vbus_freq);
 +EXPORT_SYMBOL(avalanche_get_vbus_freq);
 +
 +EXPORT_SYMBOL(avalanche_get_chip_version_info);
 +
 +
 +EXPORT_SYMBOL(avalanche_set_vbus_freq);
 +EXPORT_SYMBOL(avalanche_get_vbus_freq);
 +
 +EXPORT_SYMBOL(avalanche_get_chip_version_info);
 +

-diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_paging.c linux.dev/arch/mips/ar7/avalanche/avalanche_paging.c
---- linux.old/arch/mips/ar7/avalanche/avalanche_paging.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/ar7/avalanche/avalanche_paging.c       2005-07-09 08:00:15.287026000 +0200
+diff -urN linux.old/arch/mips/ar7/ar7/paging.c linux.dev/arch/mips/ar7/ar7/paging.c
+--- linux.old/arch/mips/ar7/ar7/paging.c       1970-01-01 01:00:00.000000000 +0100
++++ linux.dev/arch/mips/ar7/ar7/paging.c       2005-07-12 02:59:26.168672176 +0200

 @@ -0,0 +1,314 @@
 +/*
 + *  -*- linux-c -*-
 @@ -0,0 +1,314 @@
 +/*
 + *  -*- linux-c -*-


@@ -720,29 +767,9 @@ diff -urN linux.old/arch/mips/ar7/avalanche/avalanche_paging.c linux.dev/arch/mi
 +
 +      return;
 +}
 +
 +      return;
 +}

-diff -urN linux.old/arch/mips/ar7/avalanche/Makefile linux.dev/arch/mips/ar7/avalanche/Makefile
---- linux.old/arch/mips/ar7/avalanche/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/ar7/avalanche/Makefile 2005-07-09 08:00:15.288026000 +0200
-@@ -0,0 +1,16 @@
-+.S.s:
-+      $(CPP) $(AFLAGS) $< -o $*.s
-+
-+.S.o:
-+      $(CC) $(AFLAGS) -c $< -o $*.o
-+
-+EXTRA_CFLAGS := -DLITTLE_ENDIAN -D_LINK_KSEG0_
-+
-+O_TARGET := avalanche.o
-+
-+export-objs := avalanche_misc.o
-+
-+obj-y += avalanche_paging.o avalanche_jump.o avalanche_misc.o
-+
-+include $(TOPDIR)/Rules.make
-+

 diff -urN linux.old/arch/mips/ar7/cmdline.c linux.dev/arch/mips/ar7/cmdline.c
 --- linux.old/arch/mips/ar7/cmdline.c  1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/arch/mips/ar7/cmdline.c linux.dev/arch/mips/ar7/cmdline.c
 --- linux.old/arch/mips/ar7/cmdline.c  1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/cmdline.c  2005-07-09 08:00:15.288026000 +0200
++++ linux.dev/arch/mips/ar7/cmdline.c  2005-07-12 02:59:26.169672024 +0200

 @@ -0,0 +1,64 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com
 @@ -0,0 +1,64 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com


@@ -808,36 +835,10 @@ diff -urN linux.old/arch/mips/ar7/cmdline.c linux.dev/arch/mips/ar7/cmdline.c
 +              --cp;
 +      *cp = '\0';
 +}
 +              --cp;
 +      *cp = '\0';
 +}

-diff -urN linux.old/arch/mips/ar7/hal/misc.c linux.dev/arch/mips/ar7/hal/misc.c
---- linux.old/arch/mips/ar7/hal/misc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/ar7/hal/misc.c 2005-07-09 08:00:15.288026000 +0200
-@@ -0,0 +1,22 @@
-+#include <linux/slab.h>
-+
-+void *os_platform_malloc(unsigned int size)
-+{
-+      return kmalloc(size,GFP_KERNEL);
-+}
-+
-+void os_platform_free(void *p)
-+{
-+      kfree(p);
-+}
-+
-+void *os_platform_memset(void *p, int num, unsigned int size)
-+{
-+        return memset(p,num,size);
-+}
-+
-+EXPORT_SYMBOL(os_platform_malloc);
-+EXPORT_SYMBOL(os_platform_free);
-+EXPORT_SYMBOL(os_platform_memset);
-+
-+

 diff -urN linux.old/arch/mips/ar7/init.c linux.dev/arch/mips/ar7/init.c
 --- linux.old/arch/mips/ar7/init.c     1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/arch/mips/ar7/init.c linux.dev/arch/mips/ar7/init.c
 --- linux.old/arch/mips/ar7/init.c     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/init.c     2005-07-09 08:11:36.592452520 +0200
-@@ -0,0 +1,146 @@
++++ linux.dev/arch/mips/ar7/init.c     2005-07-12 02:59:26.169672024 +0200
+@@ -0,0 +1,144 @@

 +/*
 + * Carsten Langgaard, carstenl@mips.com
 + * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
 +/*
 + * Carsten Langgaard, carstenl@mips.com
 + * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.


@@ -982,12 +983,10 @@ diff -urN linux.old/arch/mips/ar7/init.c linux.dev/arch/mips/ar7/init.c
 +
 +      return 0;
 +}
 +
 +      return 0;
 +}

-+
-+EXPORT_SYMBOL(prom_getenv);

 diff -urN linux.old/arch/mips/ar7/irq.c linux.dev/arch/mips/ar7/irq.c
 --- linux.old/arch/mips/ar7/irq.c      1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/arch/mips/ar7/irq.c linux.dev/arch/mips/ar7/irq.c
 --- linux.old/arch/mips/ar7/irq.c      1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/irq.c      2005-07-09 08:00:15.289026000 +0200
-@@ -0,0 +1,669 @@
++++ linux.dev/arch/mips/ar7/irq.c      2005-07-12 02:59:26.190668832 +0200
+@@ -0,0 +1,705 @@

 +/*
 + * Nitin Dhingra, iamnd@ti.com
 + * Copyright (C) 2002 Texas Instruments, Inc.  All rights reserved.
 +/*
 + * Nitin Dhingra, iamnd@ti.com
 + * Copyright (C) 2002 Texas Instruments, Inc.  All rights reserved.


@@ -1396,10 +1395,6 @@ diff -urN linux.old/arch/mips/ar7/irq.c linux.dev/arch/mips/ar7/irq.c
 +      avalanche_hw0_ecregs->excr = 0xffffffff;       /* clear secondary interrupts 0:31 */
 +
 +
 +      avalanche_hw0_ecregs->excr = 0xffffffff;       /* clear secondary interrupts 0:31 */
 +
 +

-+      // avalanche_hw0_ipaceregs->ipacep = (2*get_avalanche_vbus_freq()/1000000)*4;
-+      /* hack for speeding up the pacing. */
-+      printk("the pacing pre-scalar has been set as 600.\n");
-+      avalanche_hw0_ipaceregs->ipacep = 600;

 +      /* Channel to line mapping, Line to Channel mapping */
 +
 +      for(i = 0; i < 40; i++)
 +      /* Channel to line mapping, Line to Channel mapping */
 +
 +      for(i = 0; i < 40; i++)


@@ -1657,27 +1652,66 @@ diff -urN linux.old/arch/mips/ar7/irq.c linux.dev/arch/mips/ar7/irq.c
 +
 +}
 +
 +
 +}
 +

++
++#define AVALANCHE_MAX_PACING_BLK   3
++#define AVALANCHE_PACING_LOW_VAL   2
++#define AVALANCHE_PACING_HIGH_VAL 63
++
++int avalanche_request_pacing(int irq_nr, unsigned int blk_num,
++                            unsigned int pace_value)
++{
++    unsigned int  blk_offset;
++    unsigned long flags;
++
++    if(irq_nr < MIPS_EXCEPTION_OFFSET &&
++       irq_nr >= AVALANCHE_INT_END_PRIMARY)
++        return (0);
++
++    if(blk_num > AVALANCHE_MAX_PACING_BLK)
++        return(-1);
++
++    if(pace_value > AVALANCHE_PACING_HIGH_VAL &&
++       pace_value < AVALANCHE_PACING_LOW_VAL)
++       return(-1);
++
++    blk_offset = blk_num*8;
++
++    save_and_cli(flags);
++
++    /* disable the interrupt pacing, if enabled previously */
++    avalanche_hw0_ipaceregs->ipacemax &= ~(0xff << blk_offset);
++
++    /* clear the pacing map */
++    avalanche_hw0_ipaceregs->ipacemap &= ~(0xff << blk_offset);
++
++    /* setup the new values */
++    avalanche_hw0_ipaceregs->ipacemap |= ((AVINTNUM(irq_nr))   << blk_offset);
++    avalanche_hw0_ipaceregs->ipacemax |= ((0x80 | pace_value)  << blk_offset);
++
++    restore_flags(flags);
++
++    return(0);
++}

 diff -urN linux.old/arch/mips/ar7/Makefile linux.dev/arch/mips/ar7/Makefile
 --- linux.old/arch/mips/ar7/Makefile   1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/arch/mips/ar7/Makefile linux.dev/arch/mips/ar7/Makefile
 --- linux.old/arch/mips/ar7/Makefile   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/Makefile   2005-07-09 08:12:52.981839568 +0200
-@@ -0,0 +1,14 @@
++++ linux.dev/arch/mips/ar7/Makefile   2005-07-12 02:59:43.730002448 +0200
+@@ -0,0 +1,13 @@

 +.S.s:
 +      $(CPP) $(AFLAGS) $< -o $*.s
 +
 +.S.o:
 +      $(CC) $(AFLAGS) -c $< -o $*.o
 +
 +.S.s:
 +      $(CPP) $(AFLAGS) $< -o $*.s
 +
 +.S.o:
 +      $(CC) $(AFLAGS) -c $< -o $*.o
 +

++EXTRA_CFLAGS := -I$(TOPDIR)/include/asm/ar7 -DLITTLE_ENDIAN -D_LINK_KSEG0_

 +O_TARGET := ar7.o
 +
 +O_TARGET := ar7.o
 +

-+export-objs += tnetd73xx_misc.o init.o
-+obj-y := setup.o irq.o mipsIRQ.o reset.o init.o memory.o printf.o cmdline.o time.o
-+obj-y += tnetd73xx_misc.o
-+obj-y += hal/misc.o
++obj-y := tnetd73xx_misc.o
++obj-y += setup.o irq.o mipsIRQ.o reset.o init.o memory.o printf.o cmdline.o time.o

 +
 +include $(TOPDIR)/Rules.make
 diff -urN linux.old/arch/mips/ar7/memory.c linux.dev/arch/mips/ar7/memory.c
 --- linux.old/arch/mips/ar7/memory.c   1970-01-01 01:00:00.000000000 +0100
 +
 +include $(TOPDIR)/Rules.make
 diff -urN linux.old/arch/mips/ar7/memory.c linux.dev/arch/mips/ar7/memory.c
 --- linux.old/arch/mips/ar7/memory.c   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/memory.c   2005-07-09 08:00:15.290026000 +0200
++++ linux.dev/arch/mips/ar7/memory.c   2005-07-12 02:59:26.190668832 +0200

 @@ -0,0 +1,130 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com
 @@ -0,0 +1,130 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com


@@ -1743,15 +1777,15 @@ diff -urN linux.old/arch/mips/ar7/memory.c linux.dev/arch/mips/ar7/memory.c
 +
 +      mdesc[0].type = yamon_dontuse;
 +      mdesc[0].base = 0x00000000;
 +
 +      mdesc[0].type = yamon_dontuse;
 +      mdesc[0].base = 0x00000000;

-+      mdesc[0].size = AVALANCHE_SDRAM_BASE;
++      mdesc[0].size = CONFIG_AR7_MEMORY;

 +
 +      mdesc[1].type = yamon_prom;
 +
 +      mdesc[1].type = yamon_prom;

-+      mdesc[1].base = AVALANCHE_SDRAM_BASE;
++      mdesc[1].base = CONFIG_AR7_MEMORY;

 +      mdesc[1].size = 0x00020000;
 +
 +      mdesc[2].type = yamon_free;
 +      mdesc[1].size = 0x00020000;
 +
 +      mdesc[2].type = yamon_free;

-+      mdesc[2].base = AVALANCHE_SDRAM_BASE + 0x00020000;
-+      mdesc[2].size = (memsize + AVALANCHE_SDRAM_BASE) - mdesc[2].base;
++      mdesc[2].base = CONFIG_AR7_MEMORY + 0x00020000;
++      mdesc[2].size = (memsize + CONFIG_AR7_MEMORY) - mdesc[2].base;

 +
 +      return &mdesc[0];
 +}
 +
 +      return &mdesc[0];
 +}


@@ -1811,7 +1845,7 @@ diff -urN linux.old/arch/mips/ar7/memory.c linux.dev/arch/mips/ar7/memory.c
 +}
 diff -urN linux.old/arch/mips/ar7/mipsIRQ.S linux.dev/arch/mips/ar7/mipsIRQ.S
 --- linux.old/arch/mips/ar7/mipsIRQ.S  1970-01-01 01:00:00.000000000 +0100
 +}
 diff -urN linux.old/arch/mips/ar7/mipsIRQ.S linux.dev/arch/mips/ar7/mipsIRQ.S
 --- linux.old/arch/mips/ar7/mipsIRQ.S  1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/mipsIRQ.S  2005-07-09 08:00:15.290026000 +0200
++++ linux.dev/arch/mips/ar7/mipsIRQ.S  2005-07-12 02:59:26.191668680 +0200

 @@ -0,0 +1,120 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com
 @@ -0,0 +1,120 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com


@@ -1935,8 +1969,8 @@ diff -urN linux.old/arch/mips/ar7/mipsIRQ.S linux.dev/arch/mips/ar7/mipsIRQ.S
 +END(mipsIRQ)
 diff -urN linux.old/arch/mips/ar7/printf.c linux.dev/arch/mips/ar7/printf.c
 --- linux.old/arch/mips/ar7/printf.c   1970-01-01 01:00:00.000000000 +0100
 +END(mipsIRQ)
 diff -urN linux.old/arch/mips/ar7/printf.c linux.dev/arch/mips/ar7/printf.c
 --- linux.old/arch/mips/ar7/printf.c   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/printf.c   2005-07-09 08:00:15.291026000 +0200
-@@ -0,0 +1,51 @@
++++ linux.dev/arch/mips/ar7/printf.c   2005-07-12 02:59:26.191668680 +0200
+@@ -0,0 +1,54 @@

 +/*
 + * Carsten Langgaard, carstenl@mips.com
 + * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
 +/*
 + * Carsten Langgaard, carstenl@mips.com
 + * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.


@@ -1967,6 +2001,9 @@ diff -urN linux.old/arch/mips/ar7/printf.c linux.dev/arch/mips/ar7/printf.c
 +#include <asm/addrspace.h>
 +#include <asm/ar7/ar7.h>
 +
 +#include <asm/addrspace.h>
 +#include <asm/ar7/ar7.h>
 +

++#define AVALANCHE_YAMON_FUNCTION_BASE             (KSEG1ADDR(0x10000500))
++#define AVALANCHE_YAMON_PROM_PRINT_COUNT_ADDR     (AVALANCHE_YAMON_FUNCTION_BASE + 0x4)  /* print_count function */
++

 +static char ppbuf[1024];
 +
 +void (*prom_print_str)(unsigned int out, char *s, int len);
 +static char ppbuf[1024];
 +
 +void (*prom_print_str)(unsigned int out, char *s, int len);


@@ -1990,7 +2027,7 @@ diff -urN linux.old/arch/mips/ar7/printf.c linux.dev/arch/mips/ar7/printf.c
 +}
 diff -urN linux.old/arch/mips/ar7/reset.c linux.dev/arch/mips/ar7/reset.c
 --- linux.old/arch/mips/ar7/reset.c    1970-01-01 01:00:00.000000000 +0100
 +}
 diff -urN linux.old/arch/mips/ar7/reset.c linux.dev/arch/mips/ar7/reset.c
 --- linux.old/arch/mips/ar7/reset.c    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/reset.c    2005-07-09 08:00:15.291026000 +0200
++++ linux.dev/arch/mips/ar7/reset.c    2005-07-12 02:59:26.191668680 +0200

 @@ -0,0 +1,54 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com
 @@ -0,0 +1,54 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com


@@ -2048,8 +2085,8 @@ diff -urN linux.old/arch/mips/ar7/reset.c linux.dev/arch/mips/ar7/reset.c
 +}
 diff -urN linux.old/arch/mips/ar7/setup.c linux.dev/arch/mips/ar7/setup.c
 --- linux.old/arch/mips/ar7/setup.c    1970-01-01 01:00:00.000000000 +0100
 +}
 diff -urN linux.old/arch/mips/ar7/setup.c linux.dev/arch/mips/ar7/setup.c
 --- linux.old/arch/mips/ar7/setup.c    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/setup.c    2005-07-09 08:00:15.291026000 +0200
-@@ -0,0 +1,167 @@
++++ linux.dev/arch/mips/ar7/setup.c    2005-07-12 02:59:26.191668680 +0200
+@@ -0,0 +1,120 @@

 +/*
 + * Carsten Langgaard, carstenl@mips.com
 + * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
 +/*
 + * Carsten Langgaard, carstenl@mips.com
 + * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.


@@ -2083,27 +2120,6 @@ diff -urN linux.old/arch/mips/ar7/setup.c linux.dev/arch/mips/ar7/setup.c
 +#include <asm/time.h>
 +#include <asm/traps.h>
 +
 +#include <asm/time.h>
 +#include <asm/traps.h>
 +

-+
-+#define _LINK_KSEG0_
-+#define LITTLE_ENDIAN
-+#include <asm/ar7/tnetd73xx.h>
-+#include <asm/ar7/tnetd73xx_misc.h>
-+
-+// Specific for ar7wrd
-+unsigned int tnetd73xx_vbus_freq;
-+#define BOOTCR_MIPS_ASYNC_MODE  (1 << 25)
-+#define AFECLK_FREQ                                 35328000
-+#define REFCLK_FREQ                                 25000000
-+#define OSC3_FREQ                                   24000000
-+#define AVALANCHE_CPMAC_INTERNAL_PHY_MASK           0x80000000
-+
-+#if defined(CONFIG_AR7_MARVELL)
-+#define AVALANCHE_CPMAC_EXTERNAL_PHY_MASK           0x00010000
-+#else
-+#define AVALANCHE_CPMAC_EXTERNAL_PHY_MASK           0x2
-+#endif
-+
-+

 +#ifdef CONFIG_KGDB
 +extern void rs_kgdb_hook(int);
 +int remote_debug = 0;
 +#ifdef CONFIG_KGDB
 +extern void rs_kgdb_hook(int);
 +int remote_debug = 0;


@@ -2116,30 +2132,6 @@ diff -urN linux.old/arch/mips/ar7/setup.c linux.dev/arch/mips/ar7/setup.c
 +extern void ar7_time_init(void);
 +extern void ar7_timer_setup(struct irqaction *irq);
 +
 +extern void ar7_time_init(void);
 +extern void ar7_timer_setup(struct irqaction *irq);
 +

-+/* maybe some of this is not needed? */
-+static void ar7_platform_init(void)
-+{
-+      //tnetd73xx_gpio_init();
-+
-+      tnetd73xx_reset_ctrl(RESET_MODULE_UART0, OUT_OF_RESET);
-+      //tnetd73xx_reset_ctrl(RESET_MODULE_GPIO, OUT_OF_RESET);
-+      //REG32_WRITE(TNETD73XX_GPIOENR, 0xf3fc3ff0);
-+
-+      //tnetd73xx_reset_ctrl(RESET_MODULE_EPHY, IN_RESET);
-+      //tnetd73xx_reset_ctrl(RESET_MODULE_EPHY, OUT_OF_RESET);
-+
-+      tnetd73xx_clkc_init(AFECLK_FREQ, REFCLK_FREQ, OSC3_FREQ);
-+
-+      tnetd73xx_vbus_freq = tnetd73xx_clkc_get_freq(CLKC_SYS) / 2;
-+
-+#if defined(CONFIG_AR7WRD)
-+      if(! (REG32_DATA(TNETD73XX_DCL_BOOTCR) & BOOTCR_MIPS_ASYNC_MODE)) {
-+              tnetd73xx_clkc_set_freq(CLKC_MIPS, CLK_MHZ(150));
-+      }
-+#endif
-+
-+}
-+

 +const char *get_system_type(void)
 +{
 +      return "Texas Instruments AR7";
 +const char *get_system_type(void)
 +{
 +      return "Texas Instruments AR7";


@@ -2210,8 +2202,6 @@ diff -urN linux.old/arch/mips/ar7/setup.c linux.dev/arch/mips/ar7/setup.c
 +
 +      rtc_ops = &no_rtc_ops;
 +
 +
 +      rtc_ops = &no_rtc_ops;
 +

-+      ar7_platform_init();
-+

 +      ar7_reboot_setup();
 +
 +      board_time_init = ar7_time_init;
 +      ar7_reboot_setup();
 +
 +      board_time_init = ar7_time_init;


@@ -2219,7 +2209,7 @@ diff -urN linux.old/arch/mips/ar7/setup.c linux.dev/arch/mips/ar7/setup.c
 +}
 diff -urN linux.old/arch/mips/ar7/time.c linux.dev/arch/mips/ar7/time.c
 --- linux.old/arch/mips/ar7/time.c     1970-01-01 01:00:00.000000000 +0100
 +}
 diff -urN linux.old/arch/mips/ar7/time.c linux.dev/arch/mips/ar7/time.c
 --- linux.old/arch/mips/ar7/time.c     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/time.c     2005-07-09 08:00:15.292025000 +0200
++++ linux.dev/arch/mips/ar7/time.c     2005-07-12 02:59:26.192668528 +0200

 @@ -0,0 +1,125 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com
 @@ -0,0 +1,125 @@
 +/*
 + * Carsten Langgaard, carstenl@mips.com


@@ -2314,7 +2304,7 @@ diff -urN linux.old/arch/mips/ar7/time.c linux.dev/arch/mips/ar7/time.c
 + */
 +static unsigned long __init cal_r4koff(void)
 +{
 + */
 +static unsigned long __init cal_r4koff(void)
 +{

-+      return ((CONFIG_AR7_FREQUENCY*500000)/HZ);
++      return ((CONFIG_AR7_CPU_FREQUENCY*500000)/HZ);

 +}
 +
 +void __init ar7_time_init(void)
 +}
 +
 +void __init ar7_time_init(void)


@@ -2348,8 +2338,8 @@ diff -urN linux.old/arch/mips/ar7/time.c linux.dev/arch/mips/ar7/time.c
 +}
 diff -urN linux.old/arch/mips/ar7/tnetd73xx_misc.c linux.dev/arch/mips/ar7/tnetd73xx_misc.c
 --- linux.old/arch/mips/ar7/tnetd73xx_misc.c   1970-01-01 01:00:00.000000000 +0100
 +}
 diff -urN linux.old/arch/mips/ar7/tnetd73xx_misc.c linux.dev/arch/mips/ar7/tnetd73xx_misc.c
 --- linux.old/arch/mips/ar7/tnetd73xx_misc.c   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/arch/mips/ar7/tnetd73xx_misc.c   2005-07-09 08:19:34.066865376 +0200
-@@ -0,0 +1,927 @@
++++ linux.dev/arch/mips/ar7/tnetd73xx_misc.c   2005-07-12 02:59:43.731002296 +0200
+@@ -0,0 +1,924 @@

 +/******************************************************************************
 + * FILE PURPOSE:    TNETD73xx Misc modules API Source
 + ******************************************************************************
 +/******************************************************************************
 + * FILE PURPOSE:    TNETD73xx Misc modules API Source
 + ******************************************************************************


@@ -2370,7 +2360,6 @@ diff -urN linux.old/arch/mips/ar7/tnetd73xx_misc.c linux.dev/arch/mips/ar7/tnetd
 +#define _LINK_KSEG0_
 +
 +#include <linux/types.h>
 +#define _LINK_KSEG0_
 +
 +#include <linux/types.h>

-+#include <linux/module.h>

 +#include <asm/ar7/tnetd73xx.h>
 +#include <asm/ar7/tnetd73xx_misc.h>
 +
 +#include <asm/ar7/tnetd73xx.h>
 +#include <asm/ar7/tnetd73xx_misc.h>
 +


@@ -2622,31 +2611,31 @@ diff -urN linux.old/arch/mips/ar7/tnetd73xx_misc.c linux.dev/arch/mips/ar7/tnetd
 +
 +
 +
 +
 +
 +

-+/****************************************************************************
-+* DATA PURPOSE:    PRIVATE Variables
-+**************************************************************************/
-+static u32 *clk_src[4];
-+static u32 mips_pll_out;
-+static u32 sys_pll_out;
-+static u32 afeclk_inp;
-+static u32 refclk_inp;
-+static u32 xtal_inp;
-+static u32 present_min;
-+static u32 present_max;
-+
-+/* Forward References */
-+static u32 find_gcd(u32 min, u32 max);
-+static u32 compute_prediv( u32 divider, u32 min, u32 max);
-+static void get_val(u32 base_freq, u32 output_freq,u32 *multiplier, u32 *divider);
-+static u32 get_base_frequency(TNETD73XX_CLKC_ID_T clk_id);
-+static void find_approx(u32 *,u32 *,u32);
-+
-+/****************************************************************************
-+* FUNCTION: tnetd73xx_clkc_init
-+****************************************************************************
-+* Description: The routine initializes the internal variables depending on
-+*              on the sources selected for different clocks.
-+***************************************************************************/
++                                                            /****************************************************************************
++                                                             * DATA PURPOSE:    PRIVATE Variables
++                                                             **************************************************************************/
++                                                            static u32 *clk_src[4];
++                                                            static u32 mips_pll_out;
++                                                            static u32 sys_pll_out;
++                                                            static u32 afeclk_inp;
++                                                            static u32 refclk_inp;
++                                                            static u32 xtal_inp;
++                                                            static u32 present_min;
++                                                            static u32 present_max;
++
++                                                            /* Forward References */
++                                                            static u32 find_gcd(u32 min, u32 max);
++                                                            static u32 compute_prediv( u32 divider, u32 min, u32 max);
++                                                            static void get_val(u32 base_freq, u32 output_freq,u32 *multiplier, u32 *divider);
++                                                            static u32 get_base_frequency(TNETD73XX_CLKC_ID_T clk_id);
++                                                            static void find_approx(u32 *,u32 *,u32);
++
++                                                            /****************************************************************************
++                                                             * FUNCTION: tnetd73xx_clkc_init
++                                                             ****************************************************************************
++                                                             * Description: The routine initializes the internal variables depending on
++                                                             *              on the sources selected for different clocks.
++                                                             ***************************************************************************/

 +void tnetd73xx_clkc_init(u32 afeclk, u32 refclk, u32 xtal3in)
 +{
 +
 +void tnetd73xx_clkc_init(u32 afeclk, u32 refclk, u32 xtal3in)
 +{
 +


@@ -3275,12 +3264,10 @@ diff -urN linux.old/arch/mips/ar7/tnetd73xx_misc.c linux.dev/arch/mips/ar7/tnetd
 +      return ( (pin_value & (1 << gpio_pin)) ? 1 : 0 );
 +}
 +
 +      return ( (pin_value & (1 << gpio_pin)) ? 1 : 0 );
 +}
 +

-+EXPORT_SYMBOL(tnetd73xx_clkc_get_freq);
-+

 diff -urN linux.old/arch/mips/config-shared.in linux.dev/arch/mips/config-shared.in
 diff -urN linux.old/arch/mips/config-shared.in linux.dev/arch/mips/config-shared.in

---- linux.old/arch/mips/config-shared.in       2005-07-09 08:01:49.831653720 +0200
-+++ linux.dev/arch/mips/config-shared.in       2005-07-09 08:00:15.293025000 +0200
-@@ -20,6 +20,15 @@
+--- linux.old/arch/mips/config-shared.in       2005-07-10 03:00:44.784181376 +0200
++++ linux.dev/arch/mips/config-shared.in       2005-07-12 02:59:26.192668528 +0200
+@@ -20,6 +20,16 @@

  mainmenu_option next_comment
  comment 'Machine selection'
  dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
  mainmenu_option next_comment
  comment 'Machine selection'
  dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL


@@ -3290,13 +3277,14 @@ diff -urN linux.old/arch/mips/config-shared.in linux.dev/arch/mips/config-shared
 +      "AR7DB CONFIG_AR7DB \
 +      AR7RD CONFIG_AR7RD \
 +      AR7WRD CONFIG_AR7WRD" AR7DB
 +      "AR7DB CONFIG_AR7DB \
 +      AR7RD CONFIG_AR7RD \
 +      AR7WRD CONFIG_AR7WRD" AR7DB

-+   int 'Texas Instruments AR7 CPU Frequency' CONFIG_AR7_FREQUENCY 150
++   int 'Texas Instruments AR7 CPU Frequency' CONFIG_AR7_CPU_FREQUENCY 150
++   int 'Texas Instruments AR7 System Frequency' CONFIG_AR7_SYS_FREQUENCY 125

 +   hex 'Texas Instruments AR7 SDRAM Start' CONFIG_AR7_MEMORY 0x14000000
 +fi
  dep_bool 'Support for Alchemy Bosporus board' CONFIG_MIPS_BOSPORUS $CONFIG_MIPS32
  dep_bool 'Support for FIC Multimedia Player board' CONFIG_MIPS_FICMMP $CONFIG_MIPS32
  dep_bool 'Support for Alchemy Mirage board' CONFIG_MIPS_MIRAGE $CONFIG_MIPS32
 +   hex 'Texas Instruments AR7 SDRAM Start' CONFIG_AR7_MEMORY 0x14000000
 +fi
  dep_bool 'Support for Alchemy Bosporus board' CONFIG_MIPS_BOSPORUS $CONFIG_MIPS32
  dep_bool 'Support for FIC Multimedia Player board' CONFIG_MIPS_FICMMP $CONFIG_MIPS32
  dep_bool 'Support for Alchemy Mirage board' CONFIG_MIPS_MIRAGE $CONFIG_MIPS32

-@@ -239,6 +248,11 @@
+@@ -239,6 +249,11 @@

     define_bool CONFIG_NONCOHERENT_IO y
     define_bool CONFIG_PC_KEYB y
  fi
     define_bool CONFIG_NONCOHERENT_IO y
     define_bool CONFIG_PC_KEYB y
  fi


@@ -3308,7 +3296,7 @@ diff -urN linux.old/arch/mips/config-shared.in linux.dev/arch/mips/config-shared
  if [ "$CONFIG_CASIO_E55" = "y" ]; then
     define_bool CONFIG_IRQ_CPU y
     define_bool CONFIG_NONCOHERENT_IO y
  if [ "$CONFIG_CASIO_E55" = "y" ]; then
     define_bool CONFIG_IRQ_CPU y
     define_bool CONFIG_NONCOHERENT_IO y

-@@ -736,6 +750,7 @@
+@@ -736,6 +751,7 @@

  mainmenu_option next_comment
  comment 'General setup'
  if [ "$CONFIG_ACER_PICA_61" = "y" -o \
  mainmenu_option next_comment
  comment 'General setup'
  if [ "$CONFIG_ACER_PICA_61" = "y" -o \


@@ -3316,7 +3304,7 @@ diff -urN linux.old/arch/mips/config-shared.in linux.dev/arch/mips/config-shared
       "$CONFIG_CASIO_E55" = "y" -o \
       "$CONFIG_DDB5074" = "y" -o \
       "$CONFIG_DDB5476" = "y" -o \
       "$CONFIG_CASIO_E55" = "y" -o \
       "$CONFIG_DDB5074" = "y" -o \
       "$CONFIG_DDB5476" = "y" -o \

-@@ -797,6 +812,7 @@
+@@ -797,6 +813,7 @@

  bool 'Networking support' CONFIG_NET
  
  if [ "$CONFIG_ACER_PICA_61" = "y" -o \
  bool 'Networking support' CONFIG_NET
  
  if [ "$CONFIG_ACER_PICA_61" = "y" -o \


@@ -3325,8 +3313,8 @@ diff -urN linux.old/arch/mips/config-shared.in linux.dev/arch/mips/config-shared
       "$CONFIG_DECSTATION" = "y" -o \
       "$CONFIG_IBM_WORKPAD" = "y" -o \
 diff -urN linux.old/arch/mips/kernel/irq.c linux.dev/arch/mips/kernel/irq.c
       "$CONFIG_DECSTATION" = "y" -o \
       "$CONFIG_IBM_WORKPAD" = "y" -o \
 diff -urN linux.old/arch/mips/kernel/irq.c linux.dev/arch/mips/kernel/irq.c

---- linux.old/arch/mips/kernel/irq.c   2005-07-09 08:01:49.831653720 +0200
-+++ linux.dev/arch/mips/kernel/irq.c   2005-07-09 08:00:15.294025000 +0200
+--- linux.old/arch/mips/kernel/irq.c   2005-07-10 03:00:44.784181376 +0200
++++ linux.dev/arch/mips/kernel/irq.c   2005-07-12 02:59:26.193668376 +0200

 @@ -76,6 +76,7 @@
   * Generic, controller-independent functions:
   */
 @@ -76,6 +76,7 @@
   * Generic, controller-independent functions:
   */


@@ -3375,9 +3363,35 @@ diff -urN linux.old/arch/mips/kernel/irq.c linux.dev/arch/mips/kernel/irq.c
  
  /*
   * IRQ autodetection code..
  
  /*
   * IRQ autodetection code..

+diff -urN linux.old/arch/mips/kernel/mips_ksyms.c linux.dev/arch/mips/kernel/mips_ksyms.c
+--- linux.old/arch/mips/kernel/mips_ksyms.c    2004-02-18 14:36:30.000000000 +0100
++++ linux.dev/arch/mips/kernel/mips_ksyms.c    2005-07-12 02:59:26.193668376 +0200
+@@ -40,6 +40,12 @@
+ extern long __strnlen_user_nocheck_asm(const char *s);
+ extern long __strnlen_user_asm(const char *s);
+ 
++#ifdef CONFIG_AR7
++int avalanche_request_pacing(int irq_nr, unsigned int blk_num, unsigned int pace_value);
++char *prom_getenv(char *envname);
++#endif
++
++
+ EXPORT_SYMBOL(mips_machtype);
+ #ifdef CONFIG_EISA
+ EXPORT_SYMBOL(EISA_bus);
+@@ -103,3 +109,9 @@
+ #endif
+ 
+ EXPORT_SYMBOL(get_wchan);
++
++#ifdef CONFIG_AR7
++EXPORT_SYMBOL_NOVERS(avalanche_request_pacing);
++EXPORT_SYMBOL_NOVERS(prom_getenv);
++#endif
++

 diff -urN linux.old/arch/mips/kernel/setup.c linux.dev/arch/mips/kernel/setup.c
 diff -urN linux.old/arch/mips/kernel/setup.c linux.dev/arch/mips/kernel/setup.c

---- linux.old/arch/mips/kernel/setup.c 2005-07-09 08:01:49.832653568 +0200
-+++ linux.dev/arch/mips/kernel/setup.c 2005-07-09 08:00:15.295025000 +0200
+--- linux.old/arch/mips/kernel/setup.c 2005-07-10 03:00:44.785181224 +0200
++++ linux.dev/arch/mips/kernel/setup.c 2005-07-12 02:59:26.194668224 +0200

 @@ -109,6 +109,7 @@
  unsigned long isa_slot_offset;
  EXPORT_SYMBOL(isa_slot_offset);
 @@ -109,6 +109,7 @@
  unsigned long isa_slot_offset;
  EXPORT_SYMBOL(isa_slot_offset);


@@ -3396,16 +3410,15 @@ diff -urN linux.old/arch/mips/kernel/setup.c linux.dev/arch/mips/kernel/setup.c
        max_pfn = 0;
        first_usable_pfn = -1UL;
        for (i = 0; i < boot_mem_map.nr_map; i++) {
        max_pfn = 0;
        first_usable_pfn = -1UL;
        for (i = 0; i < boot_mem_map.nr_map; i++) {

-@@ -376,7 +380,7 @@
- 
+@@ -377,6 +381,7 @@

        /* Reserve the bootmap memory.  */
        reserve_bootmem(PFN_PHYS(first_usable_pfn), bootmap_size);
        /* Reserve the bootmap memory.  */
        reserve_bootmem(PFN_PHYS(first_usable_pfn), bootmap_size);

--
+ 

 +#endif
  #ifdef CONFIG_BLK_DEV_INITRD
        /* Board specific code should have set up initrd_start and initrd_end */
        ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
 +#endif
  #ifdef CONFIG_BLK_DEV_INITRD
        /* Board specific code should have set up initrd_start and initrd_end */
        ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);

-@@ -494,6 +498,7 @@
+@@ -494,6 +499,7 @@

        void hp_setup(void);
        void au1x00_setup(void);
        void frame_info_init(void);
        void hp_setup(void);
        void au1x00_setup(void);
        void frame_info_init(void);


@@ -3413,7 +3426,7 @@ diff -urN linux.old/arch/mips/kernel/setup.c linux.dev/arch/mips/kernel/setup.c
  
        frame_info_init();
  #if defined(CONFIG_BLK_DEV_FD) || defined(CONFIG_BLK_DEV_FD_MODULE)
  
        frame_info_init();
  #if defined(CONFIG_BLK_DEV_FD) || defined(CONFIG_BLK_DEV_FD_MODULE)

-@@ -691,6 +696,11 @@
+@@ -691,6 +697,11 @@

                  pmc_yosemite_setup();
                  break;
  #endif
                  pmc_yosemite_setup();
                  break;
  #endif


@@ -3426,8 +3439,8 @@ diff -urN linux.old/arch/mips/kernel/setup.c linux.dev/arch/mips/kernel/setup.c
                panic("Unsupported architecture");
        }
 diff -urN linux.old/arch/mips/kernel/traps.c linux.dev/arch/mips/kernel/traps.c
                panic("Unsupported architecture");
        }
 diff -urN linux.old/arch/mips/kernel/traps.c linux.dev/arch/mips/kernel/traps.c

---- linux.old/arch/mips/kernel/traps.c 2005-07-09 08:01:49.832653568 +0200
-+++ linux.dev/arch/mips/kernel/traps.c 2005-07-09 08:00:15.295025000 +0200
+--- linux.old/arch/mips/kernel/traps.c 2005-07-10 03:00:44.786181072 +0200
++++ linux.dev/arch/mips/kernel/traps.c 2005-07-12 02:59:26.194668224 +0200

 @@ -40,6 +40,10 @@
  #include <asm/uaccess.h>
  #include <asm/mmu_context.h>
 @@ -40,6 +40,10 @@
  #include <asm/uaccess.h>
  #include <asm/mmu_context.h>


@@ -3546,8 +3559,8 @@ diff -urN linux.old/arch/mips/kernel/traps.c linux.dev/arch/mips/kernel/traps.c
        per_cpu_trap_init();
  }
 diff -urN linux.old/arch/mips/lib/promlib.c linux.dev/arch/mips/lib/promlib.c
        per_cpu_trap_init();
  }
 diff -urN linux.old/arch/mips/lib/promlib.c linux.dev/arch/mips/lib/promlib.c

---- linux.old/arch/mips/lib/promlib.c  2005-07-09 08:01:49.833653416 +0200
-+++ linux.dev/arch/mips/lib/promlib.c  2005-07-09 08:00:15.296025000 +0200
+--- linux.old/arch/mips/lib/promlib.c  2005-07-10 03:00:44.786181072 +0200
++++ linux.dev/arch/mips/lib/promlib.c  2005-07-12 02:59:26.195668072 +0200

 @@ -1,3 +1,4 @@
 +#ifndef CONFIG_AR7
  #include <stdarg.h>
 @@ -1,3 +1,4 @@
 +#ifndef CONFIG_AR7
  #include <stdarg.h>


@@ -3559,8 +3572,8 @@ diff -urN linux.old/arch/mips/lib/promlib.c linux.dev/arch/mips/lib/promlib.c
  }
 +#endif
 diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
  }
 +#endif
 diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile

---- linux.old/arch/mips/Makefile       2005-07-09 08:01:49.833653416 +0200
-+++ linux.dev/arch/mips/Makefile       2005-07-09 08:00:15.413007000 +0200
+--- linux.old/arch/mips/Makefile       2005-07-10 03:00:44.786181072 +0200
++++ linux.dev/arch/mips/Makefile       2005-07-12 02:59:26.195668072 +0200

 @@ -369,6 +369,16 @@
  endif
  
 @@ -369,6 +369,16 @@
  endif
  


@@ -3569,8 +3582,8 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
 +#
 +
 +ifdef CONFIG_AR7
 +#
 +
 +ifdef CONFIG_AR7

-+LIBS          += arch/mips/ar7/ar7.o arch/mips/ar7/avalanche/avalanche.o
-+SUBDIRS               += arch/mips/ar7 arch/mips/ar7/avalanche
++LIBS          += arch/mips/ar7/ar7.o arch/mips/ar7/ar7/ar7.o
++SUBDIRS               += arch/mips/ar7 arch/mips/ar7/ar7

 +LOADADDR      += 0x94020000
 +endif
 +
 +LOADADDR      += 0x94020000
 +endif
 +


@@ -3579,8 +3592,8 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
  #
  ifdef CONFIG_DECSTATION
 diff -urN linux.old/arch/mips/mm/init.c linux.dev/arch/mips/mm/init.c
  #
  ifdef CONFIG_DECSTATION
 diff -urN linux.old/arch/mips/mm/init.c linux.dev/arch/mips/mm/init.c

---- linux.old/arch/mips/mm/init.c      2005-07-09 08:01:49.834653264 +0200
-+++ linux.dev/arch/mips/mm/init.c      2005-07-09 08:00:15.297025000 +0200
+--- linux.old/arch/mips/mm/init.c      2005-07-10 03:00:44.787180920 +0200
++++ linux.dev/arch/mips/mm/init.c      2005-07-12 02:59:26.195668072 +0200

 @@ -40,8 +40,10 @@
  
  mmu_gather_t mmu_gathers[NR_CPUS];
 @@ -40,8 +40,10 @@
  
  mmu_gather_t mmu_gathers[NR_CPUS];


@@ -3648,8 +3661,8 @@ diff -urN linux.old/arch/mips/mm/init.c linux.dev/arch/mips/mm/init.c
  }
 +#endif
 diff -urN linux.old/arch/mips/mm/tlb-r4k.c linux.dev/arch/mips/mm/tlb-r4k.c
  }
 +#endif
 diff -urN linux.old/arch/mips/mm/tlb-r4k.c linux.dev/arch/mips/mm/tlb-r4k.c

---- linux.old/arch/mips/mm/tlb-r4k.c   2005-07-09 08:01:49.834653264 +0200
-+++ linux.dev/arch/mips/mm/tlb-r4k.c   2005-07-09 08:00:15.297025000 +0200
+--- linux.old/arch/mips/mm/tlb-r4k.c   2005-07-10 03:00:44.787180920 +0200
++++ linux.dev/arch/mips/mm/tlb-r4k.c   2005-07-12 02:59:26.196667920 +0200

 @@ -20,6 +20,10 @@
  #include <asm/pgtable.h>
  #include <asm/system.h>
 @@ -20,6 +20,10 @@
  #include <asm/pgtable.h>
  #include <asm/system.h>


@@ -3675,8 +3688,8 @@ diff -urN linux.old/arch/mips/mm/tlb-r4k.c linux.dev/arch/mips/mm/tlb-r4k.c
        }
  }
 diff -urN linux.old/drivers/char/serial.c linux.dev/drivers/char/serial.c
        }
  }
 diff -urN linux.old/drivers/char/serial.c linux.dev/drivers/char/serial.c

---- linux.old/drivers/char/serial.c    2005-07-09 08:01:49.836652960 +0200
-+++ linux.dev/drivers/char/serial.c    2005-07-09 08:00:15.299024000 +0200
+--- linux.old/drivers/char/serial.c    2005-07-10 03:00:44.789180616 +0200
++++ linux.dev/drivers/char/serial.c    2005-07-12 02:59:26.198667616 +0200

 @@ -419,7 +419,40 @@
        return 0;
  }
 @@ -419,7 +419,40 @@
        return 0;
  }


@@ -3730,12 +3743,13 @@ diff -urN linux.old/drivers/char/serial.c linux.dev/drivers/char/serial.c
  
  
  /*
  
  
  /*

-@@ -1728,7 +1763,15 @@
+@@ -1728,7 +1763,16 @@

                        /* Special case since 134 is really 134.5 */
                        quot = (2*baud_base / 269);
                else if (baud)
 +#ifdef CONFIG_AR7
                        /* Special case since 134 is really 134.5 */
                        quot = (2*baud_base / 269);
                else if (baud)
 +#ifdef CONFIG_AR7

-+                      quot = get_avalanche_vbus_freq() / baud;
++                      quot = (CONFIG_AR7_SYS_FREQUENCY*500000) / baud;
++                      //quot = get_avalanche_vbus_freq() / baud;

 +
 +              if ((quot%16)>7)
 +                      quot += 8;
 +
 +              if ((quot%16)>7)
 +                      quot += 8;


@@ -3746,7 +3760,7 @@ diff -urN linux.old/drivers/char/serial.c linux.dev/drivers/char/serial.c
        }
        /* If the quotient is zero refuse the change */
        if (!quot && old_termios) {
        }
        /* If the quotient is zero refuse the change */
        if (!quot && old_termios) {

-@@ -5552,8 +5595,10 @@
+@@ -5552,8 +5596,10 @@

                state->irq = irq_cannonicalize(state->irq);
                if (state->hub6)
                        state->io_type = SERIAL_IO_HUB6;
                state->irq = irq_cannonicalize(state->irq);
                if (state->hub6)
                        state->io_type = SERIAL_IO_HUB6;


@@ -3757,12 +3771,13 @@ diff -urN linux.old/drivers/char/serial.c linux.dev/drivers/char/serial.c
  #ifdef CONFIG_MCA                     
                if ((state->flags & ASYNC_BOOT_ONLYMCA) && !MCA_bus)
                        continue;
  #ifdef CONFIG_MCA                     
                if ((state->flags & ASYNC_BOOT_ONLYMCA) && !MCA_bus)
                        continue;

-@@ -6009,7 +6054,15 @@
+@@ -6009,7 +6055,16 @@

        info->io_type = state->io_type;
        info->iomem_base = state->iomem_base;
        info->iomem_reg_shift = state->iomem_reg_shift;
 +#ifdef CONFIG_AR7
        info->io_type = state->io_type;
        info->iomem_base = state->iomem_base;
        info->iomem_reg_shift = state->iomem_reg_shift;
 +#ifdef CONFIG_AR7

-+      quot = get_avalanche_vbus_freq() / baud;
++      //quot = get_avalanche_vbus_freq() / baud;
++      quot = (CONFIG_AR7_SYS_FREQUENCY*500000) / baud;

 +
 +      if ((quot%16)>7)
 +              quot += 8;
 +
 +      if ((quot%16)>7)
 +              quot += 8;


@@ -3775,336 +3790,45 @@ diff -urN linux.old/drivers/char/serial.c linux.dev/drivers/char/serial.c
        cval >>= 8;
 diff -urN linux.old/include/asm-mips/ar7/ar7.h linux.dev/include/asm-mips/ar7/ar7.h
 --- linux.old/include/asm-mips/ar7/ar7.h       1970-01-01 01:00:00.000000000 +0100
        cval >>= 8;
 diff -urN linux.old/include/asm-mips/ar7/ar7.h linux.dev/include/asm-mips/ar7/ar7.h
 --- linux.old/include/asm-mips/ar7/ar7.h       1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/ar7.h       2005-07-09 08:00:15.300024000 +0200
-@@ -0,0 +1,137 @@
-+#ifndef _MIPS_AR7_H
-+#define _MIPS_AR7_H
-+
-+#include <linux/config.h>
-+#include <asm/addrspace.h>
-+
-+
-+#ifndef LITTLE_ENDIAN
-+#define LITTLE_ENDIAN
-+#endif
-+
-+#ifndef _LINK_KSEG0_
-+#define _LINK_KSEG0_
-+#endif
-+
-+#include <asm/ar7/tnetd73xx.h>
-+
-+#define AVALANCHE_UART0_INT          7
-+#define AVALANCHE_UART1_INT          8
-+
-+#define MIPS_EXCEPTION_OFFSET 8
-+#define LNXINTNUM(x)((x) + MIPS_EXCEPTION_OFFSET)
-+
++++ linux.dev/include/asm-mips/ar7/ar7.h       2005-07-12 02:59:26.199667464 +0200
+@@ -0,0 +1,33 @@

 +/*
 +/*

-+ * AR7 board SDRAM base address.  This is used to setup the
-+ * bootmem tables
-+ */
-+
-+#define AVALANCHE_SDRAM_BASE CONFIG_AR7_MEMORY//0x14000000UL
-+#define AVALANCHE_INTC_BASE  TNETD73XX_INTC_BASE
-+
-+
-+/*
-+ * AR7 board vectors
-+ */
-+
-+#define AVALANCHE_VECS (KSEG1ADDR(AVALANCHE_SDRAM_BASE))
-+#define AVALANCHE_VECS_KSEG0 (KSEG0ADDR(AVALANCHE_SDRAM_BASE))
-+
-+
-+/*
-+ * Yamon Prom print address.
-+ */
-+#define AVALANCHE_YAMON_FUNCTION_BASE             (KSEG1ADDR(0x10000500))
-+#define AVALANCHE_YAMON_PROM_PRINT_COUNT_ADDR     (AVALANCHE_YAMON_FUNCTION_BASE + 0x4)  /* print_count function */
-+#define AVALANCHE_YAMON_PROM_PRINT_ADDR           (AVALANCHE_YAMON_FUNCTION_BASE + 0x34)
-+
-+/*
-+ * AR7 Reset and PSU standby register.
-+ */
-+#define AVALANCHE_SOFTRES_REG         (KSEG1ADDR(0x08611600))    /* Resets machine */
-+#define AVALANCHE_PSUSTBY_REG         (KSEG1ADDR(0x08611600))    /* Turns off power supply unit */
-+#define AVALANCHE_GORESET             0x1
-+#define AVALANCHE_GOSTBY              0x1
-+#define AVALANCHE_SWRCR              (*(unsigned int *)TNETD73XX_RST_CTRL_SWRCR)
-+
-+/*
-+ * Avalanche UART register base.
-+ */
-+
-+#define AVALANCHE_UART0_REGS_BASE (KSEG1ADDR(0x08610E00)) /* AVALANCHE UART 0 */
-+#define AVALANCHE_UART1_REGS_BASE (KSEG1ADDR(0x08610F00)) /* AVALANCHE UART 1 */
-+#define AVALANCHE_BASE_BAUD       ( 3686400 / 16 )
-+
-+/*
-+ * AVALANCHE DMA controller base
-+ */
-+
-+#define AVALANCHE_DMA0_CTRL_BASE       (KSEG1ADDR(0x08611400)) /* DMA 0 (channels 0-3) */
-+
-+
-+
-+/*
-+ * GPIO register map
-+ */
-+
-+/* to be obtained from avalanche_map.h */
-+#define  AVALANCHE_GPIO_WRITE_REG         (KSEG1ADDR(0xa8610904))
-+#define  AVALANCHE_GPIO_DIRECTION_REG     (KSEG1ADDR(0xa8610908))
-+#define  AVALANCHE_GPIO_MODE_REG          (KSEG1ADDR(0xa861090C))
-+#define  AVALANCHE_GPIO_PIN_COUNT         32
-+#define  AVALANCHE_GPIO_OFF_MAP           {0xF34FFFC0,0}
-+
-+
-+// Let us define board specific information here. 
-+
-+#if defined(CONFIG_AR7DB)
-+
-+#define AFECLK_FREQ                                 35328000
-+#define REFCLK_FREQ                                 25000000
-+#define OSC3_FREQ                                   24000000
-+#define AVALANCHE_CPMAC_INTERNAL_PHY_MASK           0x80000000
-+#define AVALANCHE_CPMAC_EXTERNAL_PHY_MASK           0x55555555  
-+
-+#endif
-+
-+
-+#if defined(CONFIG_AR7RD)
-+
-+#define AFECLK_FREQ                                 35328000
-+#define REFCLK_FREQ                                 25000000
-+#define OSC3_FREQ                                   24000000
-+#define AVALANCHE_CPMAC_INTERNAL_PHY_MASK           0x80000000
-+
-+#if defined(CONFIG_AR7_MARVELL)
-+#define AVALANCHE_CPMAC_EXTERNAL_PHY_MASK           0x00010000
-+#else
-+#define AVALANCHE_CPMAC_EXTERNAL_PHY_MASK           0x2
-+#endif
-+
-+#endif
-+
-+
-+#if defined(CONFIG_AR7WRD)
-+
-+#define AFECLK_FREQ                                 35328000
-+#define REFCLK_FREQ                                 25000000
-+#define OSC3_FREQ                                   24000000
-+#define AVALANCHE_CPMAC_INTERNAL_PHY_MASK           0x80000000
-+
-+#if defined(CONFIG_AR7_MARVELL)
-+#define AVALANCHE_CPMAC_EXTERNAL_PHY_MASK           0x00010000
-+#else
-+#define AVALANCHE_CPMAC_EXTERNAL_PHY_MASK           0x2
-+#endif
-+
-+#endif
-+
-+extern unsigned int tnetd73xx_vbus_freq;
-+#define AVALANCHE_VBUS_FREQ            tnetd73xx_vbus_freq
-+
-+static inline unsigned int get_avalanche_vbus_freq(void)
-+{
-+    return (tnetd73xx_vbus_freq);
-+}
-+
-+#endif /*_MIPS_AR7_H */
-diff -urN linux.old/include/asm-mips/ar7/avalanche.h linux.dev/include/asm-mips/ar7/avalanche.h
---- linux.old/include/asm-mips/ar7/avalanche.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/ar7/avalanche.h 2005-07-09 08:00:15.301024000 +0200
-@@ -0,0 +1,183 @@
-+/* $Id$
-+ *
-+ * avalanche.h
-+ *
-+ * Jeff Harrell, jharrell@ti.com
-+ * Copyright (C) 2000,2001,2002 Texas Instruments Inc.
-+ *
-+ *
-+ * ########################################################################
-+ *
-+ *  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.
-+ *
-+ * ########################################################################
-+ *
-+ * Defines of the AVALANCHE board specific address-MAP, registers, etc.
++ * $Id$
++ * Copyright (C) $Date$  $Author$
++ * 
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ * 
++ * This program is distributed in the hope that 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 + *
 + */
 + *
 + */

-+#ifndef _MIPS_AVALANCHE_H
-+#define _MIPS_AVALANCHE_H
-+
-+#include <asm/addrspace.h>
-+
-+/*
-+ * AVALANCHE board SDRAM base address.  This is used to setup the 
-+ * bootmem tables
-+ */
-+
-+#define AVALANCHE_SDRAM_BASE 0x14000000UL
-+
-+/*
-+ * AVALANCHE board vectors
-+ */
-+
-+#define AVALANCHE_VECS (KSEG1ADDR(AVALANCHE_SDRAM_BASE))
-+#define AVALANCHE_VECS_KSEG0 (KSEG0ADDR(AVALANCHE_SDRAM_BASE))
-+/* 
-+ * Avalanche RTC-device indirect register access.
-+ */
-+
-+#define EVM3_RTC_ADR_REG       (KSEG1ADDR(0x1f000800))
-+#define EVM3_RTC_DAT_REG       (KSEG1ADDR(0x1f000808))
-+
-+/*
-+ * Evm3 interrupt controller register base (primary) 
-+ */
-+
-+#define AVALANCHE_ICTRL_REGS_BASE  (KSEG1ADDR(0x08612400))
-+
-+/*
-+ * Avalanche exception controller register base (secondary) 
-+ */
-+#define AVALANCHE_ECTRL_REGS_BASE  (AVALANCHE_ICTRL_REGS_BASE+0x80)
-+
-+
-+/*
-+ * Avalanche Interrupt Channel Control register base
-+ */
-+#define AVALANCHE_CHCTRL_REGS_BASE (AVALANCHE_ICTRL_REGS_BASE + 0x200)
-+
-+
-+/*
-+ * Avalanche UART register base.
-+ */
-+
-+#define AVALANCHE_UART0_REGS_BASE (KSEG1ADDR(0x08610E00))  /* AVALANCHE UART 0 */
-+#define AVALANCHE_UART1_REGS_BASE (KSEG1ADDR(0x08610F00))  /* AVALANCHE UART 1 */
-+#define AVALANCHE_BASE_BAUD ( 3686400 / 16 ) 
-+/* 
-+ * AVALANCHE DMA controller base
-+ */
-+
-+#define AVALANCHE_DMA0_CTRL_BASE       (KSEG1ADDR(0x08611400)) /* DMA 0 (channels 0-3) */
-+
-+
-+/*
-+ * AVALANCHE display register base.
-+ */
-+
-+#define EVM3_ASCII_DISPLAY_POS_BASE     (KSEG1ADDR(0x1D000038))
-+#define EVM3_ASCII_DISPLAY_WORD_BASE    (KSEG1ADDR(0x1D00003F)) /* How is this used??? JAH */
-+
-+
-+#define EVM3_ASCIIPOS0                0x1D000038
-+#define EVM3_ASCIIPOS1                0x1D000039
-+#define EVM3_ASCIIPOS2                0x1D00003A
-+#define EVM3_ASCIIPOS3                0x1D00003B
-+#define EVM3_ASCIIPOS4                0x1D00003C
-+#define EVM3_ASCIIPOS5                0x1D00003D
-+#define EVM3_ASCIIPOS6                0x1D00003E
-+#define EVM3_ASCIIPOS7                0x1D00003F
-+
-+/*
-+ * Yamon Prom print address.
-+ */
-+#define AVALANCHE_YAMON_FUNCTION_BASE             (KSEG1ADDR(0x10000500))
-+#define AVALANCHE_YAMON_PROM_PRINT_COUNT_ADDR     (AVALANCHE_YAMON_FUNCTION_BASE + 0x4)  /* print_count function */
-+#define AVALANCHE_YAMON_PROM_PRINT_ADDR           (AVALANCHE_YAMON_FUNCTION_BASE + 0x34)
-+
-+/*
-+ * Evm3 Reset and PSU standby register.
-+ */
-+#define AVALANCHE_SOFTRES_REG         (KSEG1ADDR(0x08611600))    /* Resets machine */
-+#define AVALANCHE_PSUSTBY_REG         (KSEG1ADDR(0x08611600))    /* Turns off power supply unit */
-+#define AVALANCHE_GORESET             0x1
-+#define AVALANCHE_GOSTBY              0x1
-+
-+/************************************************************************
-+ *  PERIPHERAL BUS LEDs (P-LED):
-+*************************************************************************/
-+
-+/************************************************************************
-+ *      P-LED Register Addresses
-+*************************************************************************/
-+
-+#define EVM3_PLED               (KSEG1ADDR(0x01C500000)) /* 0x1D200000 P-LED          */
-+
-+
-+/************************************************************************
-+ *      Register field encodings
-+*************************************************************************/
-+
-+/******** reg: PLED ********/
-+/* bits 7:0: VAL */
-+#define EVM3_PLED_VAL_MSK             0xff
-+
-+/* bit 0:  */
-+#define EVM3_PLED_BIT0_SHF            0
-+#define EVM3_PLED_BIT0_MSK            (1 << EVM3_PLED_BIT0_SHF)
-+#define EVM3_PLED_BIT0_ON             EVM3_PLED_BIT0_MSK
-+
-+/* bit 1:  */
-+#define EVM3_PLED_BIT1_SHF            1
-+#define EVM3_PLED_BIT1_MSK            (1 << EVM3_PLED_BIT1_SHF)
-+#define EVM3_PLED_BIT1_ON             EVM3_PLED_BIT1_MSK
-+
-+/* bit 2:  */
-+#define EVM3_PLED_BIT2_SHF            2
-+#define EVM3_PLED_BIT2_MSK            (1 << EVM3_PLED_BIT2_SHF)
-+#define EVM3_PLED_BIT2_ON             EVM3_PLED_BIT2_MSK
-+
-+/* bit 3:  */
-+#define EVM3_PLED_BIT3_SHF            3
-+#define EVM3_PLED_BIT3_MSK            (1 << EVM3_PLED_BIT3_SHF)
-+#define EVM3_PLED_BIT3_ON             EVM3_PLED_BIT3_MSK
-+
-+/* bit 4:  */
-+#define EVM3_PLED_BIT4_SHF            4
-+#define EVM3_PLED_BIT4_MSK            (1 << EVM3_PLED_BIT4_SHF)
-+#define EVM3_PLED_BIT4_ON             EVM3_PLED_BIT4_MSK
-+
-+/* bit 5:  */
-+#define EVM3_PLED_BIT5_SHF            5
-+#define EVM3_PLED_BIT5_MSK            (1 << EVM3_PLED_BIT5_SHF)
-+#define EVM3_PLED_BIT5_ON             EVM3_PLED_BIT5_MSK
-+
-+/* bit 6:  */
-+#define EVM3_PLED_BIT6_SHF            6
-+#define EVM3_PLED_BIT6_MSK            (1 << EVM3_PLED_BIT6_SHF)
-+#define EVM3_PLED_BIT6_ON             EVM3_PLED_BIT6_MSK
-+
-+/* bit 7:  */
-+#define EVM3_PLED_BIT7_SHF            7
-+#define EVM3_PLED_BIT7_MSK            (1 << EVM3_PLED_BIT7_SHF)
-+#define EVM3_PLED_BIT7_ON             EVM3_PLED_BIT7_MSK
-+
-+#endif /* !(_MIPS_AVALANCHE_H) */
-+

 +
 +

++#ifndef _AR7_H
++#define _AR7_H

 +
 +

++#include <asm/addrspace.h>
++#include <linux/config.h>

 +
 +

++#define AVALANCHE_VECS_KSEG0 (KSEG0ADDR(CONFIG_AR7_MEMORY))

 +
 +

++#define AR7_UART0_REGS_BASE (KSEG1ADDR(0x08610E00))
++#define AR7_UART1_REGS_BASE (KSEG1ADDR(0x08610E00))
++#define AR7_BASE_BAUD ( 3686400 / 16 )

 +
 +

++#endif

 diff -urN linux.old/include/asm-mips/ar7/avalanche_intc.h linux.dev/include/asm-mips/ar7/avalanche_intc.h
 --- linux.old/include/asm-mips/ar7/avalanche_intc.h    1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/include/asm-mips/ar7/avalanche_intc.h linux.dev/include/asm-mips/ar7/avalanche_intc.h
 --- linux.old/include/asm-mips/ar7/avalanche_intc.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/avalanche_intc.h    2005-07-09 08:00:15.301024000 +0200
-@@ -0,0 +1,273 @@
++++ linux.dev/include/asm-mips/ar7/avalanche_intc.h    2005-07-12 02:59:26.199667464 +0200
+@@ -0,0 +1,278 @@

 + /*
 + * Nitin Dhingra, iamnd@ti.com
 + * Copyright (C) 2000 Texas Instruments Inc.
 + /*
 + * Nitin Dhingra, iamnd@ti.com
 + * Copyright (C) 2000 Texas Instruments Inc.


@@ -4162,7 +3886,12 @@ diff -urN linux.old/include/asm-mips/ar7/avalanche_intc.h linux.dev/include/asm-
 +/*
 + * Avalanche interrupt controller register base (primary)
 + */
 +/*
 + * Avalanche interrupt controller register base (primary)
 + */

-+#define AVALANCHE_ICTRL_REGS_BASE  AVALANCHE_INTC_BASE
++#define KSEG1_BASE                  0xA0000000
++#define KSEG_INV_MASK               0x1FFFFFFF /* Inverted mask for kseg address */
++#define PHYS_ADDR(addr)             ((addr) & KSEG_INV_MASK)
++#define PHYS_TO_K1(addr)            (PHYS_ADDR(addr)|KSEG1_BASE)
++
++#define AVALANCHE_ICTRL_REGS_BASE   KSEG1ADDR(0x08612400)// AVALANCHE_INTC_BASE

 +
 +/******************************************************************************
 + * Avalanche exception controller register base (secondary)
 +
 +/******************************************************************************
 + * Avalanche exception controller register base (secondary)


@@ -4380,8 +4109,8 @@ diff -urN linux.old/include/asm-mips/ar7/avalanche_intc.h linux.dev/include/asm-
 +#endif /* _AVALANCHE_INTC_H */
 diff -urN linux.old/include/asm-mips/ar7/avalanche_misc.h linux.dev/include/asm-mips/ar7/avalanche_misc.h
 --- linux.old/include/asm-mips/ar7/avalanche_misc.h    1970-01-01 01:00:00.000000000 +0100
 +#endif /* _AVALANCHE_INTC_H */
 diff -urN linux.old/include/asm-mips/ar7/avalanche_misc.h linux.dev/include/asm-mips/ar7/avalanche_misc.h
 --- linux.old/include/asm-mips/ar7/avalanche_misc.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/avalanche_misc.h    2005-07-09 08:00:15.302024000 +0200
-@@ -0,0 +1,149 @@
++++ linux.dev/include/asm-mips/ar7/avalanche_misc.h    2005-07-12 02:59:26.200667312 +0200
+@@ -0,0 +1,174 @@

 +#ifndef _AVALANCHE_MISC_H_
 +#define _AVALANCHE_MISC_H_
 +
 +#ifndef _AVALANCHE_MISC_H_
 +#define _AVALANCHE_MISC_H_
 +


@@ -4413,6 +4142,30 @@ diff -urN linux.old/include/asm-mips/ar7/avalanche_misc.h linux.dev/include/asm-
 + * Reset Control Module
 + *****************************************************************************/
 +
 + * Reset Control Module
 + *****************************************************************************/
 +

++typedef enum AVALANCHE_RESET_MODULE_tag
++{
++    RESET_MODULE_UART0      = 0,
++    RESET_MODULE_UART1      = 1,
++    RESET_MODULE_I2C        = 2,
++    RESET_MODULE_TIMER0     = 3,
++    RESET_MODULE_TIMER1     = 4,
++    RESET_MODULE_GPIO       = 6,
++    RESET_MODULE_ADSLSS     = 7,
++    RESET_MODULE_USBS       = 8,
++    RESET_MODULE_SAR        = 9,
++    RESET_MODULE_VDMA_VT    = 11,
++    RESET_MODULE_FSER       = 12,
++    RESET_MODULE_VLYNQ1     = 16,
++    RESET_MODULE_EMAC0      = 17,
++    RESET_MODULE_DMA        = 18,
++    RESET_MODULE_BIST       = 19,
++    RESET_MODULE_VLYNQ0     = 20,
++    RESET_MODULE_EMAC1      = 21,
++    RESET_MODULE_MDIO       = 22,
++    RESET_MODULE_ADSLSS_DSP = 23,
++    RESET_MODULE_EPHY       = 26
++} AVALANCHE_RESET_MODULE_T;
++

 +typedef enum AVALANCHE_RESET_CTRL_tag
 +{
 +    IN_RESET        = 0,
 +typedef enum AVALANCHE_RESET_CTRL_tag
 +{
 +    IN_RESET        = 0,


@@ -4433,13 +4186,11 @@ diff -urN linux.old/include/asm-mips/ar7/avalanche_misc.h linux.dev/include/asm-
 +    SOFTWARE_RESET1             /* Caused by writing 1 to SW1 bit in SWRCR register */
 +} AVALANCHE_SYS_RESET_STATUS_T;
 +
 +    SOFTWARE_RESET1             /* Caused by writing 1 to SW1 bit in SWRCR register */
 +} AVALANCHE_SYS_RESET_STATUS_T;
 +

-+void avalanche_reset_ctrl(unsigned int reset_module,AVALANCHE_RESET_CTRL_T reset_ctrl);
-+AVALANCHE_RESET_CTRL_T avalanche_get_reset_status(unsigned int reset_module);
++AVALANCHE_RESET_CTRL_T avalanche_get_reset_status(AVALANCHE_RESET_MODULE_T reset_module);

 +void avalanche_sys_reset(AVALANCHE_SYS_RST_MODE_T mode);
 +AVALANCHE_SYS_RESET_STATUS_T avalanche_get_sys_last_reset_status(void);
 +
 +void avalanche_sys_reset(AVALANCHE_SYS_RST_MODE_T mode);
 +AVALANCHE_SYS_RESET_STATUS_T avalanche_get_sys_last_reset_status(void);
 +

-+typedef void (*REMOTE_VLYNQ_DEV_RESET_CTRL_FN)(unsigned int reset_module, 
-+                                               AVALANCHE_RESET_CTRL_T reset_ctrl);
++typedef int (*REMOTE_VLYNQ_DEV_RESET_CTRL_FN)(unsigned int reset_module, AVALANCHE_RESET_CTRL_T reset_ctrl);

 +
 +/*****************************************************************************
 + * Power Control Module
 +
 +/*****************************************************************************
 + * Power Control Module


@@ -4514,10 +4265,13 @@ diff -urN linux.old/include/asm-mips/ar7/avalanche_misc.h linux.dev/include/asm-
 +int avalanche_gpio_ctrl(unsigned int gpio_pin,
 +                         AVALANCHE_GPIO_PIN_MODE_T pin_mode,
 +                         AVALANCHE_GPIO_PIN_DIRECTION_T pin_direction);
 +int avalanche_gpio_ctrl(unsigned int gpio_pin,
 +                         AVALANCHE_GPIO_PIN_MODE_T pin_mode,
 +                         AVALANCHE_GPIO_PIN_DIRECTION_T pin_direction);

++int avalanche_gpio_ctrl_with_link_count(unsigned int gpio_pin,
++                         AVALANCHE_GPIO_PIN_MODE_T pin_mode,
++                         AVALANCHE_GPIO_PIN_DIRECTION_T pin_direction);

 +int avalanche_gpio_out_bit(unsigned int gpio_pin, int value);
 +int avalanche_gpio_in_bit(unsigned int gpio_pin);
 +int avalanche_gpio_out_bit(unsigned int gpio_pin, int value);
 +int avalanche_gpio_in_bit(unsigned int gpio_pin);

-+int avalanche_gpio_out_value(unsigned int out_val, unsigned int set_mask, 
-+                             unsigned int reg_index);
++int avalanche_gpio_out_value(unsigned int out_val, unsigned int set_mask, unsigned int reg_index);
++int avalanche_gpio_out_value_with_link_count(unsigned int out_val, unsigned int set_mask, unsigned int reg_index);

 +int avalanche_gpio_in_value(unsigned int *in_val, unsigned int reg_index);
 +
 +unsigned int avalanche_get_chip_version_info(void);
 +int avalanche_gpio_in_value(unsigned int *in_val, unsigned int reg_index);
 +
 +unsigned int avalanche_get_chip_version_info(void);


@@ -4531,67 +4285,9 @@ diff -urN linux.old/include/asm-mips/ar7/avalanche_misc.h linux.dev/include/asm-
 +unsigned int avalanche_is_mdix_on_chip(void);
 +
 +#endif
 +unsigned int avalanche_is_mdix_on_chip(void);
 +
 +#endif

-diff -urN linux.old/include/asm-mips/ar7/avalanche_prom.h linux.dev/include/asm-mips/ar7/avalanche_prom.h
---- linux.old/include/asm-mips/ar7/avalanche_prom.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/ar7/avalanche_prom.h    2005-07-09 08:00:15.302024000 +0200
-@@ -0,0 +1,54 @@
-+/* $Id$
-+ *
-+ * prom.h
-+ *
-+ * Carsten Langgaard, carstenl@mips.com
-+ * Copyright (C) 1999 MIPS Technologies, Inc.
-+ *
-+ * ########################################################################
-+ *
-+ *  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.
-+ *
-+ * ########################################################################
-+ *
-+ * Sead bootprom interface for the Linux kernel.
-+ *
-+ */
-+
-+#ifndef _MIPS_PROM_H
-+#define _MIPS_PROM_H
-+
-+extern char *prom_getcmdline(void);
-+extern char *prom_getenv(char *name);
-+extern void setup_prom_printf(void);
-+extern void prom_printf(char *fmt, ...);
-+extern void prom_init_cmdline(void);
-+extern void prom_meminit(void);
-+extern void prom_fixup_mem_map(unsigned long start_mem, unsigned long end_mem);
-+extern void prom_free_prom_memory (void);
-+extern void sead_display_message(const char *str);
-+extern void sead_display_word(unsigned int num);
-+extern int get_ethernet_addr(char *ethernet_addr);
-+
-+/* Memory descriptor management. */
-+#define PROM_MAX_PMEMBLOCKS    32
-+struct prom_pmemblock {
-+        unsigned long base; /* Within KSEG0. */
-+        unsigned int size;  /* In bytes. */
-+        unsigned int type;  /* free or prom memory */
-+};
-+
-+
-+#endif /* !(_MIPS_PROM_H) */
-+

 diff -urN linux.old/include/asm-mips/ar7/avalanche_regs.h linux.dev/include/asm-mips/ar7/avalanche_regs.h
 --- linux.old/include/asm-mips/ar7/avalanche_regs.h    1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/include/asm-mips/ar7/avalanche_regs.h linux.dev/include/asm-mips/ar7/avalanche_regs.h
 --- linux.old/include/asm-mips/ar7/avalanche_regs.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/avalanche_regs.h    2005-07-09 08:00:15.303024000 +0200
++++ linux.dev/include/asm-mips/ar7/avalanche_regs.h    2005-07-12 02:59:26.201667160 +0200

 @@ -0,0 +1,567 @@
 +/* 
 + *  $Id$
 @@ -0,0 +1,567 @@
 +/* 
 + *  $Id$


@@ -5153,66 +4849,16 @@ diff -urN linux.old/include/asm-mips/ar7/avalanche_regs.h linux.dev/include/asm-
 +
 +#define VMAC_STATS_BASE(X)     (X + 0x00000400)
 +
 +
 +#define VMAC_STATS_BASE(X)     (X + 0x00000400)
 +

-+#endif
-+
-+
-+
++#endif __AVALANCHE_REGS_H

 +
 +
 +
 +
 +
 +

-diff -urN linux.old/include/asm-mips/ar7/hal/haltypes.h linux.dev/include/asm-mips/ar7/hal/haltypes.h
---- linux.old/include/asm-mips/ar7/hal/haltypes.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/ar7/hal/haltypes.h      2005-07-09 08:00:15.303024000 +0200
-@@ -0,0 +1,46 @@
-+/******************************************************************************
-+ * FILE PURPOSE:    Platform dependent type information Header
-+ ********************************************************************************
-+ * FILE NAME:       haltypes.h
-+ *
-+ * DESCRIPTION:     Platform dependent (tuned) types definations.
-+ *                  Intented to be used by HAL/Drivers etc.
-+ *
-+ * REVISION HISTORY:
-+ * 27 Nov 02 - PSP TII  
-+ *
-+ * (C) Copyright 2002, Texas Instruments, Inc
-+ *******************************************************************************/
-+
-+#ifndef __HAL_TYPES_H__
-+#define __HAL_TYPES_H__
-+
-+typedef char    INT8;
-+typedef short   INT16;
-+typedef int     INT32;

 +
 +

-+typedef unsigned char   UINT8;
-+typedef unsigned short  UINT16;
-+typedef unsigned int    UINT32;

 +
 +

-+typedef unsigned char   UCHAR;
-+typedef unsigned short  USHORT;
-+typedef unsigned int    UINT;
-+typedef unsigned long   ULONG;
-+
-+typedef int     BOOL;
-+typedef int     STATUS;
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif

 +
 +

-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+#ifndef NULL
-+#define NULL 0
-+#endif
-+
-+#endif /*  __HAL_TYPES_H__ */

 diff -urN linux.old/include/asm-mips/ar7/if_port.h linux.dev/include/asm-mips/ar7/if_port.h
 --- linux.old/include/asm-mips/ar7/if_port.h   1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/include/asm-mips/ar7/if_port.h linux.dev/include/asm-mips/ar7/if_port.h
 --- linux.old/include/asm-mips/ar7/if_port.h   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/if_port.h   2005-07-09 08:00:15.304024000 +0200
++++ linux.dev/include/asm-mips/ar7/if_port.h   2005-07-12 02:59:26.201667160 +0200

 @@ -0,0 +1,26 @@
 +/*******************************************************************************   
 + * FILE PURPOSE:    Interface port id Header file                                      
 @@ -0,0 +1,26 @@
 +/*******************************************************************************   
 + * FILE PURPOSE:    Interface port id Header file                                      


@@ -5242,7 +4888,7 @@ diff -urN linux.old/include/asm-mips/ar7/if_port.h linux.dev/include/asm-mips/ar
 +#endif /* _IF_PORT_H_ */
 diff -urN linux.old/include/asm-mips/ar7/sangam_boards.h linux.dev/include/asm-mips/ar7/sangam_boards.h
 --- linux.old/include/asm-mips/ar7/sangam_boards.h     1970-01-01 01:00:00.000000000 +0100
 +#endif /* _IF_PORT_H_ */
 diff -urN linux.old/include/asm-mips/ar7/sangam_boards.h linux.dev/include/asm-mips/ar7/sangam_boards.h
 --- linux.old/include/asm-mips/ar7/sangam_boards.h     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/sangam_boards.h     2005-07-09 08:00:15.304024000 +0200
++++ linux.dev/include/asm-mips/ar7/sangam_boards.h     2005-07-12 02:59:26.201667160 +0200

 @@ -0,0 +1,77 @@
 +#ifndef _SANGAM_BOARDS_H
 +#define _SANGAM_BOARDS_H
 @@ -0,0 +1,77 @@
 +#ifndef _SANGAM_BOARDS_H
 +#define _SANGAM_BOARDS_H


@@ -5321,38 +4967,9 @@ diff -urN linux.old/include/asm-mips/ar7/sangam_boards.h linux.dev/include/asm-m
 +
 +
 +#endif
 +
 +
 +#endif

-diff -urN linux.old/include/asm-mips/ar7/sangam_clk_cntl.h linux.dev/include/asm-mips/ar7/sangam_clk_cntl.h
---- linux.old/include/asm-mips/ar7/sangam_clk_cntl.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/ar7/sangam_clk_cntl.h   2005-07-09 08:00:15.304024000 +0200
-@@ -0,0 +1,25 @@
-+/*****************************************************************************
-+ * Clock Control
-+ *****************************************************************************/
-+#ifndef _SANGAM_CLK_CNTL_H_
-+#define _SANGAM_CLK_CNTL_H_
-+#include <asm/ar7/avalanche_misc.h>
-+
-+#define CLK_MHZ(x)    ( (x) * 1000000 )
-+
-+/* The order of ENUMs here should not be altered since
-+ * the register addresses are derived from the order
-+ */
-+
-+typedef enum AVALANCHE_CLKC_ID_tag
-+{
-+    CLKC_VBUS,
-+    CLKC_MIPS,
-+    CLKC_USB,
-+    CLKC_SYS
-+} AVALANCHE_CLKC_ID_T;
-+
-+void avalanche_clkc_init(unsigned int afe_clk,unsigned int refclk, unsigned int xtal3in);
-+int avalanche_clkc_set_freq(AVALANCHE_CLKC_ID_T clk_id, unsigned int output_freq);
-+unsigned int avalanche_clkc_get_freq(AVALANCHE_CLKC_ID_T clk_id);
-+#endif

 diff -urN linux.old/include/asm-mips/ar7/sangam.h linux.dev/include/asm-mips/ar7/sangam.h
 --- linux.old/include/asm-mips/ar7/sangam.h    1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/include/asm-mips/ar7/sangam.h linux.dev/include/asm-mips/ar7/sangam.h
 --- linux.old/include/asm-mips/ar7/sangam.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/sangam.h    2005-07-09 08:00:15.305023000 +0200
++++ linux.dev/include/asm-mips/ar7/sangam.h    2005-07-12 02:59:26.201667160 +0200

 @@ -0,0 +1,180 @@
 +#ifndef _SANGAM_H_
 +#define _SANGAM_H_
 @@ -0,0 +1,180 @@
 +#ifndef _SANGAM_H_
 +#define _SANGAM_H_


@@ -5536,7 +5153,7 @@ diff -urN linux.old/include/asm-mips/ar7/sangam.h linux.dev/include/asm-mips/ar7
 +#endif /*_SANGAM_H_ */
 diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_err.h linux.dev/include/asm-mips/ar7/tnetd73xx_err.h
 --- linux.old/include/asm-mips/ar7/tnetd73xx_err.h     1970-01-01 01:00:00.000000000 +0100
 +#endif /*_SANGAM_H_ */
 diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_err.h linux.dev/include/asm-mips/ar7/tnetd73xx_err.h
 --- linux.old/include/asm-mips/ar7/tnetd73xx_err.h     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/tnetd73xx_err.h     2005-07-09 08:00:15.305023000 +0200
++++ linux.dev/include/asm-mips/ar7/tnetd73xx_err.h     2005-07-12 03:01:26.109438408 +0200

 @@ -0,0 +1,42 @@
 +/******************************************************************************
 + * FILE PURPOSE:    TNETD73xx Error Definations Header File
 @@ -0,0 +1,42 @@
 +/******************************************************************************
 + * FILE PURPOSE:    TNETD73xx Error Definations Header File


@@ -5582,8 +5199,8 @@ diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_err.h linux.dev/include/asm-m
 +#endif /* __TNETD73XX_ERR_H__ */
 diff -urN linux.old/include/asm-mips/ar7/tnetd73xx.h linux.dev/include/asm-mips/ar7/tnetd73xx.h
 --- linux.old/include/asm-mips/ar7/tnetd73xx.h 1970-01-01 01:00:00.000000000 +0100
 +#endif /* __TNETD73XX_ERR_H__ */
 diff -urN linux.old/include/asm-mips/ar7/tnetd73xx.h linux.dev/include/asm-mips/ar7/tnetd73xx.h
 --- linux.old/include/asm-mips/ar7/tnetd73xx.h 1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/tnetd73xx.h 2005-07-09 08:00:15.306023000 +0200
-@@ -0,0 +1,340 @@
++++ linux.dev/include/asm-mips/ar7/tnetd73xx.h 2005-07-12 03:01:26.110438256 +0200
+@@ -0,0 +1,338 @@

 +/******************************************************************************
 + * FILE PURPOSE:    TNETD73xx Common Header File
 + ******************************************************************************
 +/******************************************************************************
 + * FILE PURPOSE:    TNETD73xx Common Header File
 + ******************************************************************************


@@ -5624,8 +5241,6 @@ diff -urN linux.old/include/asm-mips/ar7/tnetd73xx.h linux.dev/include/asm-mips/
 +
 +#ifndef _ASMLANGUAGE        /* This part not for assembly language */
 +
 +
 +#ifndef _ASMLANGUAGE        /* This part not for assembly language */
 +

-+#include <linux/types.h>
-+

 +extern unsigned int tnetd73xx_mips_freq;
 +extern unsigned int tnetd73xx_vbus_freq;
 +
 +extern unsigned int tnetd73xx_mips_freq;
 +extern unsigned int tnetd73xx_vbus_freq;
 +


@@ -5661,15 +5276,15 @@ diff -urN linux.old/include/asm-mips/ar7/tnetd73xx.h linux.dev/include/asm-mips/
 +#endif
 +
 +#ifndef KSEG0
 +#endif
 +
 +#ifndef KSEG0

-+#define KSEG0(addr)                 (((u32)(addr) & ~KSEG_MSK) | KSEG0_BASE)
++#define KSEG0(addr)                 (((__u32)(addr) & ~KSEG_MSK) | KSEG0_BASE)

 +#endif
 +
 +#ifndef KSEG1
 +#endif
 +
 +#ifndef KSEG1

-+#define KSEG1(addr)                 (((u32)(addr) & ~KSEG_MSK) | KSEG1_BASE)
++#define KSEG1(addr)                 (((__u32)(addr) & ~KSEG_MSK) | KSEG1_BASE)

 +#endif
 +
 +#ifndef KUSEG
 +#endif
 +
 +#ifndef KUSEG

-+#define KUSEG(addr)                 ((u32)(addr) & ~KSEG_MSK)
++#define KUSEG(addr)                 ((__u32)(addr) & ~KSEG_MSK)

 +#endif
 +
 +#ifndef PHYS_ADDR
 +#endif
 +
 +#ifndef PHYS_ADDR


@@ -5685,24 +5300,24 @@ diff -urN linux.old/include/asm-mips/ar7/tnetd73xx.h linux.dev/include/asm-mips/
 +#endif
 +
 +#ifndef REG8_ADDR
 +#endif
 +
 +#ifndef REG8_ADDR

-+#define REG8_ADDR(addr)             (volatile u8 *)(PHYS_TO_K1(addr))
-+#define REG8_DATA(addr)             (*(volatile u8 *)(PHYS_TO_K1(addr)))
++#define REG8_ADDR(addr)             (volatile __u8 *)(PHYS_TO_K1(addr))
++#define REG8_DATA(addr)             (*(volatile __u8 *)(PHYS_TO_K1(addr)))

 +#define REG8_WRITE(addr, data)      REG8_DATA(addr) = data;
 +#define REG8_WRITE(addr, data)      REG8_DATA(addr) = data;

-+#define REG8_READ(addr, data)       data = (u8) REG8_DATA(addr);
++#define REG8_READ(addr, data)       data = (__u8) REG8_DATA(addr);

 +#endif
 +
 +#ifndef REG16_ADDR
 +#endif
 +
 +#ifndef REG16_ADDR

-+#define REG16_ADDR(addr)            (volatile u16 *)(PHYS_TO_K1(addr))
-+#define REG16_DATA(addr)            (*(volatile u16 *)(PHYS_TO_K1(addr)))
++#define REG16_ADDR(addr)            (volatile __u16 *)(PHYS_TO_K1(addr))
++#define REG16_DATA(addr)            (*(volatile __u16 *)(PHYS_TO_K1(addr)))

 +#define REG16_WRITE(addr, data)     REG16_DATA(addr) = data;
 +#define REG16_WRITE(addr, data)     REG16_DATA(addr) = data;

-+#define REG16_READ(addr, data)      data = (u16) REG16_DATA(addr);
++#define REG16_READ(addr, data)      data = (__u16) REG16_DATA(addr);

 +#endif
 +
 +#ifndef REG32_ADDR
 +#endif
 +
 +#ifndef REG32_ADDR

-+#define REG32_ADDR(addr)            (volatile u32 *)(PHYS_TO_K1(addr))
-+#define REG32_DATA(addr)            (*(volatile u32 *)(PHYS_TO_K1(addr)))
++#define REG32_ADDR(addr)            (volatile __u32 *)(PHYS_TO_K1(addr))
++#define REG32_DATA(addr)            (*(volatile __u32 *)(PHYS_TO_K1(addr)))

 +#define REG32_WRITE(addr, data)     REG32_DATA(addr) = data;
 +#define REG32_WRITE(addr, data)     REG32_DATA(addr) = data;

-+#define REG32_READ(addr, data)      data = (u32) REG32_DATA(addr);
++#define REG32_READ(addr, data)      data = (__u32) REG32_DATA(addr);

 +#endif
 +
 +#ifdef  _LINK_KSEG0_                /* Application is linked into KSEG0 space */
 +#endif
 +
 +#ifdef  _LINK_KSEG0_                /* Application is linked into KSEG0 space */


@@ -5926,8 +5541,8 @@ diff -urN linux.old/include/asm-mips/ar7/tnetd73xx.h linux.dev/include/asm-mips/
 +#endif /* __TNETD73XX_H_ */
 diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_misc.h linux.dev/include/asm-mips/ar7/tnetd73xx_misc.h
 --- linux.old/include/asm-mips/ar7/tnetd73xx_misc.h    1970-01-01 01:00:00.000000000 +0100
 +#endif /* __TNETD73XX_H_ */
 diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_misc.h linux.dev/include/asm-mips/ar7/tnetd73xx_misc.h
 --- linux.old/include/asm-mips/ar7/tnetd73xx_misc.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/tnetd73xx_misc.h    2005-07-09 08:00:15.306023000 +0200
-@@ -0,0 +1,243 @@
++++ linux.dev/include/asm-mips/ar7/tnetd73xx_misc.h    2005-07-12 03:01:26.110438256 +0200
+@@ -0,0 +1,239 @@

 +/******************************************************************************
 + * FILE PURPOSE:    TNETD73xx Misc modules API Header
 + ******************************************************************************
 +/******************************************************************************
 + * FILE PURPOSE:    TNETD73xx Misc modules API Header
 + ******************************************************************************


@@ -5947,10 +5562,6 @@ diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_misc.h linux.dev/include/asm-
 +#ifndef __TNETD73XX_MISC_H__
 +#define __TNETD73XX_MISC_H__
 +
 +#ifndef __TNETD73XX_MISC_H__
 +#define __TNETD73XX_MISC_H__
 +

-+#include <linux/types.h>
-+
-+#define BOOTCR_MIPS_ASYNC_MODE  (1 << 25)
-+

 +/*****************************************************************************
 + * Reset Control Module
 + *****************************************************************************/
 +/*****************************************************************************
 + * Reset Control Module
 + *****************************************************************************/


@@ -6108,9 +5719,9 @@ diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_misc.h linux.dev/include/asm-
 +    CLKC_ADSLSS
 +} TNETD73XX_CLKC_ID_T;
 +
 +    CLKC_ADSLSS
 +} TNETD73XX_CLKC_ID_T;
 +

-+void tnetd73xx_clkc_init(u32 afeclk, u32 refclk, u32 xtal3in);
-+TNETD73XX_ERR tnetd73xx_clkc_set_freq(TNETD73XX_CLKC_ID_T clk_id, u32 output_freq);
-+u32 tnetd73xx_clkc_get_freq(TNETD73XX_CLKC_ID_T clk_id);
++void tnetd73xx_clkc_init(__u32 afeclk, __u32 refclk, __u32 xtal3in);
++TNETD73XX_ERR tnetd73xx_clkc_set_freq(TNETD73XX_CLKC_ID_T clk_id, __u32 output_freq);
++__u32 tnetd73xx_clkc_get_freq(TNETD73XX_CLKC_ID_T clk_id);

 +
 +/*****************************************************************************
 + * GPIO Control 
 +
 +/*****************************************************************************
 + * GPIO Control 


@@ -6168,12 +5779,12 @@ diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_misc.h linux.dev/include/asm-
 +int tnetd73xx_gpio_in(TNETD73XX_GPIO_PIN_T gpio_pin);
 +
 +/* TNETD73XX Revision */
 +int tnetd73xx_gpio_in(TNETD73XX_GPIO_PIN_T gpio_pin);
 +
 +/* TNETD73XX Revision */

-+u32 tnetd73xx_get_revision(void);
++__u32 tnetd73xx_get_revision(void);

 +
 +#endif /* __TNETD73XX_MISC_H__ */
 diff -urN linux.old/include/asm-mips/io.h linux.dev/include/asm-mips/io.h
 +
 +#endif /* __TNETD73XX_MISC_H__ */
 diff -urN linux.old/include/asm-mips/io.h linux.dev/include/asm-mips/io.h

---- linux.old/include/asm-mips/io.h    2005-07-09 08:01:49.846651440 +0200
-+++ linux.dev/include/asm-mips/io.h    2005-07-09 08:00:15.307023000 +0200
+--- linux.old/include/asm-mips/io.h    2005-07-10 03:00:44.797179400 +0200
++++ linux.dev/include/asm-mips/io.h    2005-07-12 02:59:26.202667008 +0200

 @@ -63,8 +63,12 @@
  #ifdef CONFIG_64BIT_PHYS_ADDR
  #define page_to_phys(page)    ((u64)(page - mem_map) << PAGE_SHIFT)
 @@ -63,8 +63,12 @@
  #ifdef CONFIG_64BIT_PHYS_ADDR
  #define page_to_phys(page)    ((u64)(page - mem_map) << PAGE_SHIFT)


@@ -6188,8 +5799,8 @@ diff -urN linux.old/include/asm-mips/io.h linux.dev/include/asm-mips/io.h
  #define IO_SPACE_LIMIT 0xffff
  
 diff -urN linux.old/include/asm-mips/irq.h linux.dev/include/asm-mips/irq.h
  #define IO_SPACE_LIMIT 0xffff
  
 diff -urN linux.old/include/asm-mips/irq.h linux.dev/include/asm-mips/irq.h

---- linux.old/include/asm-mips/irq.h   2005-07-09 08:01:49.847651288 +0200
-+++ linux.dev/include/asm-mips/irq.h   2005-07-09 08:00:15.307023000 +0200
+--- linux.old/include/asm-mips/irq.h   2005-07-10 03:00:44.798179248 +0200
++++ linux.dev/include/asm-mips/irq.h   2005-07-12 02:59:26.202667008 +0200

 @@ -14,7 +14,12 @@
  #include <linux/config.h>
  #include <linux/linkage.h>
 @@ -14,7 +14,12 @@
  #include <linux/config.h>
  #include <linux/linkage.h>


@@ -6204,8 +5815,8 @@ diff -urN linux.old/include/asm-mips/irq.h linux.dev/include/asm-mips/irq.h
  #ifdef CONFIG_I8259
  static inline int irq_cannonicalize(int irq)
 diff -urN linux.old/include/asm-mips/page.h linux.dev/include/asm-mips/page.h
  #ifdef CONFIG_I8259
  static inline int irq_cannonicalize(int irq)
 diff -urN linux.old/include/asm-mips/page.h linux.dev/include/asm-mips/page.h

---- linux.old/include/asm-mips/page.h  2005-07-09 08:01:49.847651288 +0200
-+++ linux.dev/include/asm-mips/page.h  2005-07-09 08:00:15.308023000 +0200
+--- linux.old/include/asm-mips/page.h  2005-07-10 03:00:44.798179248 +0200
++++ linux.dev/include/asm-mips/page.h  2005-07-12 02:59:26.202667008 +0200

 @@ -129,7 +129,11 @@
  
  #define __pa(x)               ((unsigned long) (x) - PAGE_OFFSET)
 @@ -129,7 +129,11 @@
  
  #define __pa(x)               ((unsigned long) (x) - PAGE_OFFSET)


@@ -6219,8 +5830,8 @@ diff -urN linux.old/include/asm-mips/page.h linux.dev/include/asm-mips/page.h
  
  #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
 diff -urN linux.old/include/asm-mips/pgtable-32.h linux.dev/include/asm-mips/pgtable-32.h
  
  #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
 diff -urN linux.old/include/asm-mips/pgtable-32.h linux.dev/include/asm-mips/pgtable-32.h

---- linux.old/include/asm-mips/pgtable-32.h    2005-07-09 08:01:49.847651288 +0200
-+++ linux.dev/include/asm-mips/pgtable-32.h    2005-07-09 08:00:15.308023000 +0200
+--- linux.old/include/asm-mips/pgtable-32.h    2005-07-10 03:00:44.798179248 +0200
++++ linux.dev/include/asm-mips/pgtable-32.h    2005-07-12 02:59:26.203666856 +0200

 @@ -108,7 +108,18 @@
   * and a page entry and page directory to the page they refer to.
   */
 @@ -108,7 +108,18 @@
   * and a page entry and page directory to the page they refer to.
   */


@@ -6262,8 +5873,8 @@ diff -urN linux.old/include/asm-mips/pgtable-32.h linux.dev/include/asm-mips/pgt
  #define __mk_pte(page_nr,pgprot) __pte(((page_nr) << (PAGE_SHIFT+2)) | pgprot_val(pgprot))
  #else
 diff -urN linux.old/include/asm-mips/serial.h linux.dev/include/asm-mips/serial.h
  #define __mk_pte(page_nr,pgprot) __pte(((page_nr) << (PAGE_SHIFT+2)) | pgprot_val(pgprot))
  #else
 diff -urN linux.old/include/asm-mips/serial.h linux.dev/include/asm-mips/serial.h

---- linux.old/include/asm-mips/serial.h        2005-07-09 08:01:49.848651136 +0200
-+++ linux.dev/include/asm-mips/serial.h        2005-07-09 08:00:15.308023000 +0200
+--- linux.old/include/asm-mips/serial.h        2005-07-10 03:00:44.799179096 +0200
++++ linux.dev/include/asm-mips/serial.h        2005-07-12 02:59:26.203666856 +0200

 @@ -65,6 +65,15 @@
  
  #define C_P(card,port) (((card)<<6|(port)<<3) + 1)
 @@ -65,6 +65,15 @@
  
  #define C_P(card,port) (((card)<<6|(port)<<3) + 1)


@@ -6271,8 +5882,8 @@ diff -urN linux.old/include/asm-mips/serial.h linux.dev/include/asm-mips/serial.
 +#ifdef CONFIG_AR7
 +#include <asm/ar7/ar7.h>
 +#define AR7_SERIAL_PORT_DEFNS  \
 +#ifdef CONFIG_AR7
 +#include <asm/ar7/ar7.h>
 +#define AR7_SERIAL_PORT_DEFNS  \

-+      { 0, AVALANCHE_BASE_BAUD, AVALANCHE_UART0_REGS_BASE, LNXINTNUM(AVALANCHE_UART0_INT), STD_COM_FLAGS }, \
-+      { 0, AVALANCHE_BASE_BAUD, AVALANCHE_UART1_REGS_BASE, LNXINTNUM(AVALANCHE_UART1_INT), STD_COM_FLAGS }, 
++      { 0, AR7_BASE_BAUD, AR7_UART0_REGS_BASE, LNXINTNUM(AVALANCHE_UART0_INT), STD_COM_FLAGS }, \
++      { 0, AR7_BASE_BAUD, AR7_UART1_REGS_BASE, LNXINTNUM(AVALANCHE_UART1_INT), STD_COM_FLAGS }, 

 +#else 
 +#define AR7_SERIAL_PORT_DEFNS
 +#endif
 +#else 
 +#define AR7_SERIAL_PORT_DEFNS
 +#endif


@@ -6289,8 +5900,8 @@ diff -urN linux.old/include/asm-mips/serial.h linux.dev/include/asm-mips/serial.
        AU1000_SERIAL_PORT_DEFNS                \
        COBALT_SERIAL_PORT_DEFNS                \
 diff -urN linux.old/Makefile linux.dev/Makefile
        AU1000_SERIAL_PORT_DEFNS                \
        COBALT_SERIAL_PORT_DEFNS                \
 diff -urN linux.old/Makefile linux.dev/Makefile

---- linux.old/Makefile 2005-07-09 08:01:49.848651136 +0200
-+++ linux.dev/Makefile 2005-07-09 08:00:15.404008000 +0200
+--- linux.old/Makefile 2005-07-10 03:00:44.799179096 +0200
++++ linux.dev/Makefile 2005-07-12 02:59:26.204666704 +0200

 @@ -91,7 +91,7 @@
  
  CPPFLAGS := -D__KERNEL__ -I$(HPATH)
 @@ -91,7 +91,7 @@
  
  CPPFLAGS := -D__KERNEL__ -I$(HPATH)