fix led driver (for power led), remove led support stuff from atm driver (crashes...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1406 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 1930b57..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,6 +1,6 @@
-diff -urN kernel-base/arch/mips/ar7/ar7/jump.S kernel-current/arch/mips/ar7/ar7/jump.S
---- kernel-base/arch/mips/ar7/ar7/jump.S       1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/ar7/jump.S    2005-07-10 06:40:39.582267000 +0200
+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$
 @@ -0,0 +1,89 @@
 +/*
 + * $Id$


@@ -91,9 +91,9 @@ diff -urN kernel-base/arch/mips/ar7/ar7/jump.S kernel-current/arch/mips/ar7/ar7/
 +END(jump_dedicated_interrupt)
 +
 +      .set at
 +END(jump_dedicated_interrupt)
 +
 +      .set at

-diff -urN kernel-base/arch/mips/ar7/ar7/Makefile kernel-current/arch/mips/ar7/ar7/Makefile
---- kernel-base/arch/mips/ar7/ar7/Makefile     1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/ar7/Makefile  2005-07-10 17:46:24.037377984 +0200
+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$
 @@ -0,0 +1,31 @@
 +# $Id$
 +# Copyright (C) $Date$  $Author$


@@ -126,9 +126,9 @@ diff -urN kernel-base/arch/mips/ar7/ar7/Makefile kernel-current/arch/mips/ar7/ar
 +obj-y += paging.o jump.o misc.o
 +
 +include $(TOPDIR)/Rules.make
 +obj-y += paging.o jump.o misc.o
 +
 +include $(TOPDIR)/Rules.make

-diff -urN kernel-base/arch/mips/ar7/ar7/misc.c kernel-current/arch/mips/ar7/ar7/misc.c
---- kernel-base/arch/mips/ar7/ar7/misc.c       1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/ar7/misc.c    2005-07-10 19:02:11.699779472 +0200
+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>
 @@ -0,0 +1,319 @@
 +#include <asm/ar7/sangam.h>
 +#include <asm/ar7/avalanche_misc.h>


@@ -449,9 +449,9 @@ diff -urN kernel-base/arch/mips/ar7/ar7/misc.c kernel-current/arch/mips/ar7/ar7/
 +
 +EXPORT_SYMBOL(avalanche_get_chip_version_info);
 +
 +
 +EXPORT_SYMBOL(avalanche_get_chip_version_info);
 +

-diff -urN kernel-base/arch/mips/ar7/ar7/paging.c kernel-current/arch/mips/ar7/ar7/paging.c
---- kernel-base/arch/mips/ar7/ar7/paging.c     1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/ar7/paging.c  2005-07-10 07:08:33.725758000 +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 -*-


@@ -767,9 +767,9 @@ diff -urN kernel-base/arch/mips/ar7/ar7/paging.c kernel-current/arch/mips/ar7/ar
 +
 +      return;
 +}
 +
 +      return;
 +}

-diff -urN kernel-base/arch/mips/ar7/cmdline.c kernel-current/arch/mips/ar7/cmdline.c
---- kernel-base/arch/mips/ar7/cmdline.c        1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/cmdline.c     2005-07-10 06:40:39.584266000 +0200
+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-12 02:59:26.169672024 +0200

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


@@ -835,9 +835,9 @@ diff -urN kernel-base/arch/mips/ar7/cmdline.c kernel-current/arch/mips/ar7/cmdli
 +              --cp;
 +      *cp = '\0';
 +}
 +              --cp;
 +      *cp = '\0';
 +}

-diff -urN kernel-base/arch/mips/ar7/init.c kernel-current/arch/mips/ar7/init.c
---- kernel-base/arch/mips/ar7/init.c   1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/init.c        2005-07-10 17:53:38.565319696 +0200
+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-12 02:59:26.169672024 +0200

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


@@ -983,9 +983,9 @@ diff -urN kernel-base/arch/mips/ar7/init.c kernel-current/arch/mips/ar7/init.c
 +
 +      return 0;
 +}
 +
 +      return 0;
 +}

-diff -urN kernel-base/arch/mips/ar7/irq.c kernel-current/arch/mips/ar7/irq.c
---- kernel-base/arch/mips/ar7/irq.c    1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/irq.c 2005-07-10 17:53:17.841470200 +0200
+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-12 02:59:26.190668832 +0200

 @@ -0,0 +1,705 @@
 +/*
 + * Nitin Dhingra, iamnd@ti.com
 @@ -0,0 +1,705 @@
 +/*
 + * Nitin Dhingra, iamnd@ti.com


@@ -1692,41 +1692,26 @@ diff -urN kernel-base/arch/mips/ar7/irq.c kernel-current/arch/mips/ar7/irq.c
 +
 +    return(0);
 +}
 +
 +    return(0);
 +}

-diff -urN kernel-base/arch/mips/ar7/Makefile kernel-current/arch/mips/ar7/Makefile
---- kernel-base/arch/mips/ar7/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/Makefile      2005-07-10 17:53:46.635092904 +0200
-@@ -0,0 +1,28 @@
-+# $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
-+
+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-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
 +

-+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 += setup.o irq.o mipsIRQ.o reset.o init.o memory.o printf.o cmdline.o time.o

 +
 +include $(TOPDIR)/Rules.make
 +
 +include $(TOPDIR)/Rules.make

-diff -urN kernel-base/arch/mips/ar7/memory.c kernel-current/arch/mips/ar7/memory.c
---- kernel-base/arch/mips/ar7/memory.c 1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/memory.c      2005-07-10 06:40:39.586266000 +0200
+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-12 02:59:26.190668832 +0200

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


@@ -1858,9 +1843,9 @@ diff -urN kernel-base/arch/mips/ar7/memory.c kernel-current/arch/mips/ar7/memory
 +      }
 +      printk("Freeing prom memory: %ldkb freed\n", freed >> 10);
 +}
 +      }
 +      printk("Freeing prom memory: %ldkb freed\n", freed >> 10);
 +}

-diff -urN kernel-base/arch/mips/ar7/mipsIRQ.S kernel-current/arch/mips/ar7/mipsIRQ.S
---- kernel-base/arch/mips/ar7/mipsIRQ.S        1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/mipsIRQ.S     2005-07-10 06:40:39.587266000 +0200
+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-12 02:59:26.191668680 +0200

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


@@ -1982,9 +1967,9 @@ diff -urN kernel-base/arch/mips/ar7/mipsIRQ.S kernel-current/arch/mips/ar7/mipsI
 +      j       ret_from_irq
 +      nop
 +END(mipsIRQ)
 +      j       ret_from_irq
 +      nop
 +END(mipsIRQ)

-diff -urN kernel-base/arch/mips/ar7/printf.c kernel-current/arch/mips/ar7/printf.c
---- kernel-base/arch/mips/ar7/printf.c 1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/printf.c      2005-07-10 06:40:39.587266000 +0200
+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-12 02:59:26.191668680 +0200

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


@@ -2040,9 +2025,9 @@ diff -urN kernel-base/arch/mips/ar7/printf.c kernel-current/arch/mips/ar7/printf
 +      return;
 +
 +}
 +      return;
 +
 +}

-diff -urN kernel-base/arch/mips/ar7/reset.c kernel-current/arch/mips/ar7/reset.c
---- kernel-base/arch/mips/ar7/reset.c  1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/reset.c       2005-07-10 06:40:39.587266000 +0200
+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-12 02:59:26.191668680 +0200

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


@@ -2098,9 +2083,9 @@ diff -urN kernel-base/arch/mips/ar7/reset.c kernel-current/arch/mips/ar7/reset.c
 +      _machine_halt = ar7_machine_halt;
 +      _machine_power_off = ar7_machine_power_off;
 +}
 +      _machine_halt = ar7_machine_halt;
 +      _machine_power_off = ar7_machine_power_off;
 +}

-diff -urN kernel-base/arch/mips/ar7/setup.c kernel-current/arch/mips/ar7/setup.c
---- kernel-base/arch/mips/ar7/setup.c  1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/setup.c       2005-07-10 06:40:39.588266000 +0200
+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-12 02:59:26.191668680 +0200

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


@@ -2222,9 +2207,9 @@ diff -urN kernel-base/arch/mips/ar7/setup.c kernel-current/arch/mips/ar7/setup.c
 +      board_time_init = ar7_time_init;
 +      board_timer_setup = ar7_timer_setup;
 +}
 +      board_time_init = ar7_time_init;
 +      board_timer_setup = ar7_timer_setup;
 +}

-diff -urN kernel-base/arch/mips/ar7/time.c kernel-current/arch/mips/ar7/time.c
---- kernel-base/arch/mips/ar7/time.c   1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/arch/mips/ar7/time.c        2005-07-10 06:40:39.588266000 +0200
+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-12 02:59:26.192668528 +0200

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


@@ -2302,58 +2287,986 @@ diff -urN kernel-base/arch/mips/ar7/time.c kernel-current/arch/mips/ar7/time.c
 +      } while (((unsigned long)read_c0_count()
 +                              - r4k_cur) < 0x7fffffff);
 +
 +      } while (((unsigned long)read_c0_count()
 +                              - r4k_cur) < 0x7fffffff);
 +

-+      irq_exit(cpu, MIPS_CPU_TIMER_IRQ);
++      irq_exit(cpu, MIPS_CPU_TIMER_IRQ);
++
++      if (softirq_pending(cpu))
++              do_softirq();
++
++      return;
++
++null:
++      ack_r4ktimer(0);
++}
++
++/*
++ * Figure out the r4k offset, the amount to increment the compare
++ * register for each time tick.
++ */
++static unsigned long __init cal_r4koff(void)
++{
++      return ((CONFIG_AR7_CPU_FREQUENCY*500000)/HZ);
++}
++
++void __init ar7_time_init(void)
++{
++      unsigned long flags;
++      unsigned int est_freq; 
++
++      set_except_vector(0, mipsIRQ);
++      write_c0_count(0);
++
++      printk("calculating r4koff... ");
++      r4k_offset = cal_r4koff();
++      printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset);
++
++      est_freq = 2*r4k_offset*HZ;
++      est_freq += 5000;    /* round */
++      est_freq -= est_freq%10000;
++      printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
++                      (est_freq%1000000)*100/1000000);
++}
++
++void __init ar7_timer_setup(struct irqaction *irq)
++{
++      /* we are using the cpu counter for timer interrupts */
++      irq->handler = no_action;     /* we use our own handler */
++      setup_irq(MIPS_CPU_TIMER_IRQ, irq);
++
++      r4k_cur = (read_c0_count() + r4k_offset);
++      write_c0_compare(r4k_cur);
++      set_c0_status(ALLINTS);
++}
+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-12 02:59:43.731002296 +0200
+@@ -0,0 +1,924 @@
++/******************************************************************************
++ * FILE PURPOSE:    TNETD73xx Misc modules API Source
++ ******************************************************************************
++ * FILE NAME:       tnetd73xx_misc.c
++ *
++ * DESCRIPTION:     Clock Control, Reset Control, Power Management, GPIO
++ *                  FSER Modules API
++ *                  As per TNETD73xx specifications
++ *
++ * REVISION HISTORY:
++ * 27 Nov 02 - Sharath Kumar     PSP TII  
++ * 14 Feb 03 - Anant Gole        PSP TII
++ *
++ * (C) Copyright 2002, Texas Instruments, Inc
++ *******************************************************************************/
++
++#define LITTLE_ENDIAN
++#define _LINK_KSEG0_
++
++#include <linux/types.h>
++#include <asm/ar7/tnetd73xx.h>
++#include <asm/ar7/tnetd73xx_misc.h>
++
++/* TNETD73XX Revision */
++u32 tnetd73xx_get_revision(void)
++{
++      /* Read Chip revision register - This register is from GPIO module */
++      return ( (u32) REG32_DATA(TNETD73XX_CVR));
++}
++
++/*****************************************************************************
++ * Reset Control Module
++ *****************************************************************************/
++
++
++void tnetd73xx_reset_ctrl(TNETD73XX_RESET_MODULE_T reset_module, TNETD73XX_RESET_CTRL_T reset_ctrl)
++{
++      u32 reset_status;
++
++      /* read current reset register */
++      REG32_READ(TNETD73XX_RST_CTRL_PRCR, reset_status);
++
++      if (reset_ctrl == OUT_OF_RESET)
++      {
++              /* bring module out of reset */
++              reset_status |= (1 << reset_module);
++      }
++      else
++      {
++              /* put module in reset */
++              reset_status &= (~(1 << reset_module));
++      }
++
++      /* write to the reset register */
++      REG32_WRITE(TNETD73XX_RST_CTRL_PRCR, reset_status);
++}
++
++
++TNETD73XX_RESET_CTRL_T tnetd73xx_get_reset_status (TNETD73XX_RESET_MODULE_T reset_module)
++{
++      u32 reset_status;
++
++      REG32_READ(TNETD73XX_RST_CTRL_PRCR, reset_status);
++      return ( (reset_status & (1 << reset_module)) ? OUT_OF_RESET : IN_RESET );
++}
++
++void tnetd73xx_sys_reset(TNETD73XX_SYS_RST_MODE_T mode)
++{
++      REG32_WRITE(TNETD73XX_RST_CTRL_SWRCR, mode);
++}
++
++#define TNETD73XX_RST_CTRL_RSR_MASK 0x3
++
++TNETD73XX_SYS_RESET_STATUS_T tnetd73xx_get_sys_last_reset_status()
++{
++      u32 sys_reset_status;
++
++      REG32_READ(TNETD73XX_RST_CTRL_RSR, sys_reset_status);
++
++      return ( (TNETD73XX_SYS_RESET_STATUS_T) (sys_reset_status & TNETD73XX_RST_CTRL_RSR_MASK) );
++}
++
++
++/*****************************************************************************
++ * Power Control Module
++ *****************************************************************************/
++#define TNETD73XX_GLOBAL_POWER_DOWN_MASK    0x3FFFFFFF      /* bit 31, 30 masked */
++#define TNETD73XX_GLOBAL_POWER_DOWN_BIT     30              /* shift to bit 30, 31 */
++
++
++void tnetd73xx_power_ctrl(TNETD73XX_POWER_MODULE_T power_module, TNETD73XX_POWER_CTRL_T power_ctrl)
++{
++      u32 power_status;
++
++      /* read current power down control register */
++      REG32_READ(TNETD73XX_POWER_CTRL_PDCR, power_status);
++
++      if (power_ctrl == POWER_CTRL_POWER_DOWN)
++      {
++              /* power down the module */
++              power_status |= (1 << power_module);
++      }
++      else
++      {
++              /* power on the module */
++              power_status &= (~(1 << power_module));
++      }
++
++      /* write to the reset register */
++      REG32_WRITE(TNETD73XX_POWER_CTRL_PDCR, power_status);
++}
++
++TNETD73XX_POWER_CTRL_T tnetd73xx_get_pwr_status(TNETD73XX_POWER_MODULE_T power_module)
++{
++      u32 power_status;
++
++      /* read current power down control register */
++      REG32_READ(TNETD73XX_POWER_CTRL_PDCR, power_status);
++
++      return ( (power_status & (1 << power_module)) ? POWER_CTRL_POWER_DOWN : POWER_CTRL_POWER_UP );
++}
++
++void tnetd73xx_set_global_pwr_mode(TNETD73XX_SYS_POWER_MODE_T power_mode)
++{
++      u32 power_status;
++
++      /* read current power down control register */
++      REG32_READ(TNETD73XX_POWER_CTRL_PDCR, power_status);
++
++      power_status &= TNETD73XX_GLOBAL_POWER_DOWN_MASK;
++      power_status |= ( power_mode << TNETD73XX_GLOBAL_POWER_DOWN_BIT);
++
++      /* write to power down control register */
++      REG32_WRITE(TNETD73XX_POWER_CTRL_PDCR, power_status);
++}
++
++TNETD73XX_SYS_POWER_MODE_T tnetd73xx_get_global_pwr_mode()
++{
++      u32 power_status;
++
++      /* read current power down control register */
++      REG32_READ(TNETD73XX_POWER_CTRL_PDCR, power_status);
++
++      power_status &= (~TNETD73XX_GLOBAL_POWER_DOWN_MASK);
++      power_status = ( power_status >> TNETD73XX_GLOBAL_POWER_DOWN_BIT);
++
++      return ( (TNETD73XX_SYS_POWER_MODE_T) power_status );
++}
++
++
++/*****************************************************************************
++ * Wakeup Control
++ *****************************************************************************/
++
++#define TNETD73XX_WAKEUP_POLARITY_BIT   16
++
++void tnetd73xx_wakeup_ctrl(TNETD73XX_WAKEUP_INTERRUPT_T wakeup_int,
++              TNETD73XX_WAKEUP_CTRL_T wakeup_ctrl,
++              TNETD73XX_WAKEUP_POLARITY_T wakeup_polarity)
++{
++      u32 wakeup_status;
++
++      /* read the wakeup control register */
++      REG32_READ(TNETD73XX_POWER_CTRL_WKCR, wakeup_status);
++
++      /* enable/disable */
++      if (wakeup_ctrl == WAKEUP_ENABLED)
++      {
++              /* enable wakeup */
++              wakeup_status |= wakeup_int;
++      }
++      else
++      {
++              /* disable wakeup */
++              wakeup_status &= (~wakeup_int);
++      }
++
++      /* set polarity */
++      if (wakeup_polarity == WAKEUP_ACTIVE_LOW)
++      {
++              wakeup_status |= (wakeup_int << TNETD73XX_WAKEUP_POLARITY_BIT);
++      }
++      else
++      {
++              wakeup_status &= ~(wakeup_int << TNETD73XX_WAKEUP_POLARITY_BIT);
++      }
++
++      /* write  the wakeup control register */
++      REG32_WRITE(TNETD73XX_POWER_CTRL_WKCR, wakeup_status);
++}
++
++
++/*****************************************************************************
++ * FSER  Control
++ *****************************************************************************/
++
++void tnetd73xx_fser_ctrl(TNETD73XX_FSER_MODE_T fser_mode)
++{
++      REG32_WRITE(TNETD73XX_FSER_BASE, fser_mode);
++}
++
++/*****************************************************************************
++ * Clock Control
++ *****************************************************************************/
++
++#define MIN(x,y)               ( ((x) <  (y)) ? (x) : (y) )
++#define MAX(x,y)               ( ((x) >  (y)) ? (x) : (y) )
++#define ABS(x)                 ( ((signed)(x) > 0) ? (x) : (-(x)) )
++#define CEIL(x,y)              ( ((x) + (y) / 2) / (y) )
++
++#define CLKC_CLKCR(x)          (TNETD73XX_CLOCK_CTRL_BASE + 0x20 + (0x20 * (x)))
++#define CLKC_CLKPLLCR(x)       (TNETD73XX_CLOCK_CTRL_BASE + 0x30 + (0x20 * (x)))
++
++#define CLKC_PRE_DIVIDER        0x0000001F
++#define CLKC_POST_DIVIDER       0x001F0000
++
++#define CLKC_PLL_STATUS         0x1
++#define CLKC_PLL_FACTOR         0x0000F000
++
++#define BOOTCR_PLL_BYPASS       (1 << 5)
++#define BOOTCR_MIPS_ASYNC_MODE  (1 << 25)
++
++#define MIPS_PLL_SELECT         0x00030000
++#define SYSTEM_PLL_SELECT       0x0000C000
++#define USB_PLL_SELECT          0x000C0000
++#define ADSLSS_PLL_SELECT       0x00C00000
++
++#define MIPS_AFECLKI_SELECT     0x00000000
++#define MIPS_REFCLKI_SELECT     0x00010000
++#define MIPS_XTAL3IN_SELECT     0x00020000
++
++#define SYSTEM_AFECLKI_SELECT   0x00000000
++#define SYSTEM_REFCLKI_SELECT   0x00004000
++#define SYSTEM_XTAL3IN_SELECT   0x00008000
++#define SYSTEM_MIPSPLL_SELECT   0x0000C000
++
++#define USB_SYSPLL_SELECT       0x00000000
++#define USB_REFCLKI_SELECT      0x00040000
++#define USB_XTAL3IN_SELECT      0x00080000
++#define USB_MIPSPLL_SELECT      0x000C0000
++
++#define ADSLSS_AFECLKI_SELECT   0x00000000
++#define ADSLSS_REFCLKI_SELECT   0x00400000
++#define ADSLSS_XTAL3IN_SELECT   0x00800000
++#define ADSLSS_MIPSPLL_SELECT   0x00C00000
++
++#define  SYS_MAX                CLK_MHZ(150)
++#define  SYS_MIN                CLK_MHZ(1)
++
++#define  MIPS_SYNC_MAX          SYS_MAX
++#define  MIPS_ASYNC_MAX         CLK_MHZ(160)
++#define  MIPS_MIN               CLK_MHZ(1)
++
++#define  USB_MAX                CLK_MHZ(100)
++#define  USB_MIN                CLK_MHZ(1)
++
++#define  ADSL_MAX               CLK_MHZ(180)
++#define  ADSL_MIN               CLK_MHZ(1)
++
++#define  PLL_MUL_MAXFACTOR      15
++#define  MAX_DIV_VALUE          32
++#define  MIN_DIV_VALUE          1
++
++#define  MIN_PLL_INP_FREQ       CLK_MHZ(8)
++#define  MAX_PLL_INP_FREQ       CLK_MHZ(100)
++
++#define  DIVIDER_LOCK_TIME      10100
++#define  PLL_LOCK_TIME          10100 * 75
++
++
++
++                                                            /****************************************************************************
++                                                             * 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)
++{
++
++      u32 choice;
++
++      afeclk_inp = afeclk;
++      refclk_inp = refclk;
++      xtal_inp = xtal3in;
++
++      choice = REG32_DATA(TNETD73XX_DCL_BOOTCR) & MIPS_PLL_SELECT;
++      switch(choice)
++      {
++              case MIPS_AFECLKI_SELECT:
++                      clk_src[CLKC_MIPS] = &afeclk_inp;
++                      break;
++
++              case MIPS_REFCLKI_SELECT:
++                      clk_src[CLKC_MIPS] = &refclk_inp;
++                      break;
++
++              case MIPS_XTAL3IN_SELECT:
++                      clk_src[CLKC_MIPS] = &xtal_inp;
++                      break;
++
++              default :
++                      clk_src[CLKC_MIPS] = 0;
++
++      }
++
++      choice = REG32_DATA(TNETD73XX_DCL_BOOTCR) & SYSTEM_PLL_SELECT;
++      switch(choice)
++      {
++              case SYSTEM_AFECLKI_SELECT:
++                      clk_src[CLKC_SYS] = &afeclk_inp;
++                      break;
++
++              case SYSTEM_REFCLKI_SELECT:
++                      clk_src[CLKC_SYS] = &refclk_inp;
++                      break;
++
++              case SYSTEM_XTAL3IN_SELECT:
++                      clk_src[CLKC_SYS] = &xtal_inp;
++                      break;
++
++              case SYSTEM_MIPSPLL_SELECT:
++                      clk_src[CLKC_SYS] = &mips_pll_out;
++                      break;
++
++              default :
++                      clk_src[CLKC_SYS] = 0;
++
++      }
++
++
++      choice = REG32_DATA(TNETD73XX_DCL_BOOTCR) & ADSLSS_PLL_SELECT;
++      switch(choice)
++      {
++              case ADSLSS_AFECLKI_SELECT:
++                      clk_src[CLKC_ADSLSS] = &afeclk_inp;
++                      break;
++
++              case ADSLSS_REFCLKI_SELECT:
++                      clk_src[CLKC_ADSLSS] = &refclk_inp;
++                      break;
++
++              case ADSLSS_XTAL3IN_SELECT:
++                      clk_src[CLKC_ADSLSS] = &xtal_inp;
++                      break;
++
++              case ADSLSS_MIPSPLL_SELECT:
++                      clk_src[CLKC_ADSLSS] = &mips_pll_out;
++                      break;
++
++              default :
++                      clk_src[CLKC_ADSLSS] = 0;
++
++      }
++
++
++      choice = REG32_DATA(TNETD73XX_DCL_BOOTCR) & USB_PLL_SELECT;
++      switch(choice)
++      {
++              case USB_SYSPLL_SELECT:
++                      clk_src[CLKC_USB] = &sys_pll_out ;
++                      break;
++
++              case USB_REFCLKI_SELECT:
++                      clk_src[CLKC_USB] = &refclk_inp;
++                      break;
++
++              case USB_XTAL3IN_SELECT:
++                      clk_src[CLKC_USB] = &xtal_inp;
++                      break;
++
++              case USB_MIPSPLL_SELECT:
++                      clk_src[CLKC_USB] = &mips_pll_out;
++                      break;
++
++              default :
++                      clk_src[CLKC_USB] = 0;
++
++      }
++}
++
++
++
++/****************************************************************************
++ * FUNCTION: tnetd73xx_clkc_set_freq
++ ****************************************************************************
++ * Description: The above routine is called to set the output_frequency of the
++ *              selected clock(using clk_id) to the  required value given
++ *              by the variable output_freq.
++ ***************************************************************************/
++TNETD73XX_ERR tnetd73xx_clkc_set_freq
++(
++ TNETD73XX_CLKC_ID_T clk_id,
++ u32              output_freq
++ )
++{
++      u32 base_freq;
++      u32 multiplier;
++      u32 divider;
++      u32 min_prediv;
++      u32 max_prediv;
++      u32 prediv;
++      u32 postdiv;
++      u32 temp;
++
++      /* check if PLLs are bypassed*/
++      if(REG32_DATA(TNETD73XX_DCL_BOOTCR) & BOOTCR_PLL_BYPASS)
++      {
++              return TNETD73XX_ERR_ERROR;
++      }
++
++      /*check if the requested output_frequency is in valid range*/
++      switch( clk_id )
++      {
++              case CLKC_SYS:
++                      if( output_freq < SYS_MIN || output_freq > SYS_MAX)
++                      {
++                              return TNETD73XX_ERR_ERROR;
++                      }
++                      present_min = SYS_MIN;
++                      present_max = SYS_MAX;
++                      break;
++
++              case CLKC_MIPS:
++                      if((output_freq < MIPS_MIN) ||
++                                      (output_freq > ((REG32_DATA(TNETD73XX_DCL_BOOTCR) & BOOTCR_MIPS_ASYNC_MODE) ? MIPS_ASYNC_MAX: MIPS_SYNC_MAX)))
++                      {
++                              return TNETD73XX_ERR_ERROR;
++                      }
++                      present_min = MIPS_MIN;
++                      present_max = (REG32_DATA(TNETD73XX_DCL_BOOTCR) & BOOTCR_MIPS_ASYNC_MODE) ? MIPS_ASYNC_MAX: MIPS_SYNC_MAX;
++                      break;
++
++              case CLKC_USB:
++                      if( output_freq < USB_MIN || output_freq > USB_MAX)
++                      {
++                              return TNETD73XX_ERR_ERROR;
++                      }
++                      present_min = USB_MIN;
++                      present_max = USB_MAX;
++                      break;
++
++              case CLKC_ADSLSS:
++                      if( output_freq < ADSL_MIN || output_freq > ADSL_MAX)
++                      {
++                              return TNETD73XX_ERR_ERROR;
++                      }
++                      present_min = ADSL_MIN;
++                      present_max = ADSL_MAX;
++                      break;
++      }
++
++
++      base_freq = get_base_frequency(clk_id);
++
++
++      /* check for minimum base frequency value */
++      if( base_freq < MIN_PLL_INP_FREQ)
++      {
++              return TNETD73XX_ERR_ERROR;
++      }
++
++      get_val(output_freq, base_freq, &multiplier, &divider);
++
++      /* check multiplier range  */
++      if( (multiplier  > PLL_MUL_MAXFACTOR) || (multiplier <= 0) )
++      {
++              return TNETD73XX_ERR_ERROR;
++      }
++
++      /* check divider value */
++      if( divider == 0 )
++      {
++              return TNETD73XX_ERR_ERROR;
++      }
++
++      /*compute minimum and maximum predivider values */
++      min_prediv = MAX(base_freq / MAX_PLL_INP_FREQ + 1, divider / MAX_DIV_VALUE + 1);
++      max_prediv = MIN(base_freq / MIN_PLL_INP_FREQ, MAX_DIV_VALUE);
++
++      /*adjust  the value of divider so that it not less than minimum predivider value*/
++      if (divider < min_prediv)
++      {
++              temp = CEIL(min_prediv, divider);
++              if ((temp * multiplier) > PLL_MUL_MAXFACTOR)
++              {
++                      return TNETD73XX_ERR_ERROR  ;
++              }
++              else
++              {
++                      multiplier = temp * multiplier;
++                      divider = min_prediv;
++              }
++
++      }
++
++      /* compute predivider  and postdivider values */
++      prediv = compute_prediv (divider, min_prediv, max_prediv);
++      postdiv = CEIL(divider,prediv);
++
++      /*return fail if postdivider value falls out of range */
++      if(postdiv > MAX_DIV_VALUE)
++      {
++              return TNETD73XX_ERR_ERROR;
++      }
++
++
++      /*write predivider and postdivider values*/
++      /* pre-Divider and post-divider are 5 bit N+1 dividers */
++      REG32_WRITE(CLKC_CLKCR(clk_id), ((postdiv -1) & 0x1F) << 16 | ((prediv -1) & 0x1F) );
++
++      /*wait for divider output to stabilise*/
++      for(temp =0; temp < DIVIDER_LOCK_TIME; temp++);
++
++      /*write to PLL clock register*/
++
++      if(clk_id == CLKC_SYS)
++      {
++              /* but before writing put DRAM to hold mode */
++              REG32_DATA(TNETD73XX_EMIF_SDRAM_CFG) |= 0x80000000;
++      }
++      /*Bring PLL into div mode */
++      REG32_WRITE(CLKC_CLKPLLCR(clk_id), 0x4);
++
++      /*compute the word to be written to PLLCR
++       *corresponding to multiplier value
++       */
++      multiplier = (((multiplier - 1) & 0xf) << 12)| ((255 <<3) | 0x0e);
++
++      /* wait till PLL enters div mode */
++      while(REG32_DATA(CLKC_CLKPLLCR(clk_id)) & CLKC_PLL_STATUS)
++              /*nothing*/;
++
++      REG32_WRITE(CLKC_CLKPLLCR(clk_id), multiplier);
++
++      while(!REG32_DATA(CLKC_CLKPLLCR(clk_id)) & CLKC_PLL_STATUS)
++              /*nothing*/;
++
++
++      /*wait for External pll to lock*/
++      for(temp =0; temp < PLL_LOCK_TIME; temp++);
++
++      if(clk_id == CLKC_SYS)
++      {
++              /* Bring DRAM out of hold */
++              REG32_DATA(TNETD73XX_EMIF_SDRAM_CFG) &= ~0x80000000;
++      }
++
++      return TNETD73XX_ERR_OK ;
++}
++
++/****************************************************************************
++ * FUNCTION: tnetd73xx_clkc_get_freq
++ ****************************************************************************
++ * Description: The above routine is called to get the output_frequency of the
++ *              selected clock( clk_id)
++ ***************************************************************************/
++u32 tnetd73xx_clkc_get_freq
++(
++ TNETD73XX_CLKC_ID_T clk_id
++ )
++{
++
++      u32  clk_ctrl_register;
++      u32  clk_pll_setting;
++      u32  clk_predivider;
++      u32  clk_postdivider;
++      u16  pll_factor;
++      u32  base_freq;
++      u32  divider;
++
++      base_freq = get_base_frequency(clk_id);
++
++      clk_ctrl_register = REG32_DATA(CLKC_CLKCR(clk_id));
++
++      /* pre-Divider and post-divider are 5 bit N+1 dividers */
++      clk_predivider = (CLKC_PRE_DIVIDER & clk_ctrl_register) + 1;
++      clk_postdivider = ((CLKC_POST_DIVIDER & clk_ctrl_register) >> 16) + 1;
++
++      divider =  clk_predivider * clk_postdivider;
++
++
++      if( (REG32_DATA(TNETD73XX_DCL_BOOTCR) & BOOTCR_PLL_BYPASS))
++      {
++              return (CEIL(base_freq, divider));  /* PLLs bypassed.*/
++      }
++
++
++      else
++      {
++              /*  return the current clock speed based upon the PLL setting */
++              clk_pll_setting = REG32_DATA(CLKC_CLKPLLCR(clk_id));
++
++              /* Get the PLL multiplication factor */
++              pll_factor = ((clk_pll_setting & CLKC_PLL_FACTOR) >> 12) + 1;
++
++              /* Check if we're in divide mode or multiply mode */
++              if((clk_pll_setting & 0x1)   == 0)
++              {
++                      /* We're in divide mode */
++                      if(pll_factor <  0x10)
++                              return (CEIL(base_freq >> 1, divider));
++                      else
++                              return (CEIL(base_freq >> 2, divider));
++              }
++
++              else     /* We're in PLL mode */
++              {
++                      /* See if PLLNDIV & PLLDIV are set */
++                      if((clk_pll_setting & 0x0800) && (clk_pll_setting & 0x2))
++                      {
++                              if(clk_pll_setting & 0x1000)
++                              {
++                                      /* clk = base_freq * k/2  */
++                                      return(CEIL((base_freq * pll_factor) >> 1, divider));
++                              }
++                              else
++                              {
++                                      /* clk = base_freq * (k-1) / 4)*/
++                                      return(CEIL((base_freq * (pll_factor - 1)) >>2, divider));
++                              }
++                      }
++                      else
++                      {
++                              if(pll_factor < 0x10)
++                              {
++                                      /* clk = base_freq * k */
++                                      return(CEIL(base_freq * pll_factor, divider));
++                              }
++
++                              else
++                              {
++                                      /* clk = base_freq  */
++                                      return(CEIL(base_freq, divider));
++                              }
++                      }
++              }
++              return(0); /* Should never reach here */
++
++      }
++
++}
++
++
++/* local helper functions */
++
++/****************************************************************************
++ * FUNCTION: get_base_frequency
++ ****************************************************************************
++ * Description: The above routine is called to get base frequency of the clocks.
++ ***************************************************************************/
++
++static u32 get_base_frequency(TNETD73XX_CLKC_ID_T clk_id)
++{
++      /* update the current MIPs PLL output value, if the required
++       * source is MIPS PLL
++       */
++      if ( clk_src[clk_id] == &mips_pll_out)
++      {
++              *clk_src[clk_id] = tnetd73xx_clkc_get_freq(CLKC_MIPS);
++      }
++
++
++      /* update the current System PLL output value, if the required
++       * source is system PLL
++       */
++      if ( clk_src[clk_id] == &sys_pll_out)
++      {
++              *clk_src[clk_id] = tnetd73xx_clkc_get_freq(CLKC_SYS);
++      }
++
++      return (*clk_src[clk_id]);
++
++}
++
++
++
++/****************************************************************************
++ * FUNCTION: find_gcd
++ ****************************************************************************
++ * Description: The above routine is called to find gcd of 2 numbers.
++ ***************************************************************************/
++static u32 find_gcd
++(
++ u32 min,
++ u32 max
++ )
++{
++      if (max % min == 0)
++      {
++              return min;
++      }
++      else
++      {
++              return find_gcd(max % min, min);
++      }
++}
++
++/****************************************************************************
++ * FUNCTION: compute_prediv
++ ****************************************************************************
++ * Description: The above routine is called to compute predivider value
++ ***************************************************************************/
++static u32 compute_prediv(u32 divider, u32 min, u32 max)
++{
++      u16 prediv;
++
++      /* return the divider itself it it falls within the range of predivider*/
++      if (min <= divider && divider <= max)
++      {
++              return divider;
++      }
++
++      /* find a value for prediv such that it is a factor of divider */
++      for (prediv = max; prediv >= min ; prediv--)
++      {
++              if ( (divider % prediv) == 0 )
++              {
++                      return prediv;
++              }
++      }
++
++      /* No such factor exists,  return min as prediv */
++      return min;
++}
++
++/****************************************************************************
++ * FUNCTION: get_val
++ ****************************************************************************
++ * Description: This routine is called to get values of divider and multiplier.
++ ***************************************************************************/
++
++static void get_val(u32 output_freq, u32 base_freq,u32 *multiplier, u32 *divider)
++{
++      u32 temp_mul;
++      u32 temp_div;
++      u32 gcd;
++      u32 min_freq;
++      u32 max_freq;
++
++      /* find gcd of base_freq, output_freq */
++      min_freq = (base_freq < output_freq) ? base_freq : output_freq;
++      max_freq = (base_freq > output_freq) ? base_freq : output_freq;
++      gcd = find_gcd(min_freq , max_freq);
++
++      if(gcd == 0)
++              return;  /* ERROR */
++
++      /* compute values of multiplier and divider */
++      temp_mul = output_freq / gcd;
++      temp_div = base_freq / gcd;
++
++
++      /* set multiplier such that 1 <= multiplier <= PLL_MUL_MAXFACTOR */
++      if( temp_mul > PLL_MUL_MAXFACTOR )
++      {
++              if((temp_mul / temp_div) > PLL_MUL_MAXFACTOR)
++                      return;
++
++              find_approx(&temp_mul,&temp_div,base_freq);
++      }
++
++      *multiplier = temp_mul;
++      *divider    = temp_div;
++}
++
++/****************************************************************************
++ * FUNCTION: find_approx
++ ****************************************************************************
++ * Description: This function gets the approx value of num/denom.
++ ***************************************************************************/
++
++static void find_approx(u32 *num,u32 *denom,u32 base_freq)
++{
++      u32 num1;
++      u32 denom1;
++      u32 num2;
++      u32 denom2;
++      int32_t closest;
++      int32_t prev_closest;
++      u32 temp_num;
++      u32 temp_denom;
++      u32 normalize;
++      u32 gcd;
++      u32 output_freq;
++
++      num1 = *num;
++      denom1 = *denom;
++
++      prev_closest = 0x7fffffff; /* maximum possible value */
++      num2 = num1;
++      denom2 = denom1;
++
++      /* start with  max */
++      for(temp_num = 15; temp_num >=1; temp_num--)
++      {
++
++              temp_denom = CEIL(temp_num * denom1, num1);
++              output_freq = (temp_num * base_freq) / temp_denom;
++
++              if(temp_denom < 1)
++              {
++                      break;
++              }
++              else
++              {
++                      normalize = CEIL(num1,temp_num);
++                      closest = (ABS((num1 * (temp_denom) ) - (temp_num * denom1)))  * normalize;
++                      if(closest < prev_closest && output_freq > present_min && output_freq <present_max)
++                      {
++                              prev_closest = closest;
++                              num2 = temp_num;
++                              denom2 = temp_denom;
++                      }
++
++              }

 +
 +

-+      if (softirq_pending(cpu))
-+              do_softirq();
++      }

 +
 +

-+      return;
++      gcd = find_gcd(num2,denom2);
++      num2 = num2 / gcd;
++      denom2 = denom2 /gcd;

 +
 +

-+null:
-+      ack_r4ktimer(0);
++      *num      = num2;
++      *denom    = denom2;

 +}
 +
 +}
 +

-+/*
-+ * Figure out the r4k offset, the amount to increment the compare
-+ * register for each time tick.
-+ */
-+static unsigned long __init cal_r4koff(void)
++
++/*****************************************************************************
++ * GPIO  Control
++ *****************************************************************************/
++
++/****************************************************************************
++ * FUNCTION: tnetd73xx_gpio_init
++ ***************************************************************************/
++void tnetd73xx_gpio_init()

 +{
 +{

-+      return ((CONFIG_AR7_CPU_FREQUENCY*500000)/HZ);
++      /* Bring module out of reset */
++      tnetd73xx_reset_ctrl(RESET_MODULE_GPIO, OUT_OF_RESET);
++      REG32_WRITE(TNETD73XX_GPIOENR, 0xFFFFFFFF);    

 +}
 +
 +}
 +

-+void __init ar7_time_init(void)
++/****************************************************************************
++ * FUNCTION: tnetd73xx_gpio_ctrl
++ ***************************************************************************/
++void tnetd73xx_gpio_ctrl(TNETD73XX_GPIO_PIN_T gpio_pin, 
++              TNETD73XX_GPIO_PIN_MODE_T pin_mode,
++              TNETD73XX_GPIO_PIN_DIRECTION_T pin_direction)

 +{
 +{

-+      unsigned long flags;
-+      unsigned int est_freq; 
-+
-+      set_except_vector(0, mipsIRQ);
-+      write_c0_count(0);
++      u32 pin_status;
++      REG32_READ(TNETD73XX_GPIOENR, pin_status);
++      if (pin_mode == GPIO_PIN)
++      {
++              pin_status |= (1 << gpio_pin);
++              REG32_WRITE(TNETD73XX_GPIOENR, pin_status);

 +
 +

-+      printk("calculating r4koff... ");
-+      r4k_offset = cal_r4koff();
-+      printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset);
++              /* Set pin direction */
++              REG32_READ(TNETD73XX_GPIOPDIRR, pin_status);
++              if (pin_direction == GPIO_INPUT_PIN)
++              {
++                      pin_status |= (1 << gpio_pin);
++              }
++              else /* GPIO_OUTPUT_PIN */
++              {
++                      pin_status &= (~(1 << gpio_pin));
++              }
++              REG32_WRITE(TNETD73XX_GPIOPDIRR, pin_status);
++      }
++      else /* FUNCTIONAL PIN */
++      {
++              pin_status &= (~(1 << gpio_pin));
++              REG32_WRITE(TNETD73XX_GPIOENR, pin_status);
++      }

 +
 +

-+      est_freq = 2*r4k_offset*HZ;
-+      est_freq += 5000;    /* round */
-+      est_freq -= est_freq%10000;
-+      printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
-+                      (est_freq%1000000)*100/1000000);

 +}
 +
 +}
 +

-+void __init ar7_timer_setup(struct irqaction *irq)
++/****************************************************************************
++ * FUNCTION: tnetd73xx_gpio_out
++ ***************************************************************************/
++void tnetd73xx_gpio_out(TNETD73XX_GPIO_PIN_T gpio_pin, int value)

 +{
 +{

-+      /* we are using the cpu counter for timer interrupts */
-+      irq->handler = no_action;     /* we use our own handler */
-+      setup_irq(MIPS_CPU_TIMER_IRQ, irq);
++      u32 pin_value;

 +
 +

-+      r4k_cur = (read_c0_count() + r4k_offset);
-+      write_c0_compare(r4k_cur);
-+      set_c0_status(ALLINTS);
++      REG32_READ(TNETD73XX_GPIODOUTR, pin_value);
++      if (value == 1)
++      {
++              pin_value |= (1 << gpio_pin);
++      }
++      else
++      {
++              pin_value &= (~(1 << gpio_pin));
++      }
++      REG32_WRITE(TNETD73XX_GPIODOUTR, pin_value);
++}
++
++/****************************************************************************
++ * FUNCTION: tnetd73xx_gpio_in
++ ***************************************************************************/
++int tnetd73xx_gpio_in(TNETD73XX_GPIO_PIN_T gpio_pin)
++{
++      u32 pin_value;
++      REG32_READ(TNETD73XX_GPIODINR, pin_value);
++      return ( (pin_value & (1 << gpio_pin)) ? 1 : 0 );

 +}
 +}

-diff -urN kernel-base/arch/mips/config-shared.in kernel-current/arch/mips/config-shared.in
---- kernel-base/arch/mips/config-shared.in     2005-07-10 03:00:44.784181376 +0200
-+++ kernel-current/arch/mips/config-shared.in  2005-07-10 06:40:39.589266000 +0200
++
+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-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'
 @@ -20,6 +20,16 @@
  mainmenu_option next_comment
  comment 'Machine selection'


@@ -2399,9 +3312,9 @@ diff -urN kernel-base/arch/mips/config-shared.in kernel-current/arch/mips/config
       "$CONFIG_CASIO_E55" = "y" -o \
       "$CONFIG_DECSTATION" = "y" -o \
       "$CONFIG_IBM_WORKPAD" = "y" -o \
       "$CONFIG_CASIO_E55" = "y" -o \
       "$CONFIG_DECSTATION" = "y" -o \
       "$CONFIG_IBM_WORKPAD" = "y" -o \

-diff -urN kernel-base/arch/mips/kernel/irq.c kernel-current/arch/mips/kernel/irq.c
---- kernel-base/arch/mips/kernel/irq.c 2005-07-10 03:00:44.784181376 +0200
-+++ kernel-current/arch/mips/kernel/irq.c      2005-07-10 06:40:39.589266000 +0200
+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-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:
   */


@@ -2450,9 +3363,9 @@ diff -urN kernel-base/arch/mips/kernel/irq.c kernel-current/arch/mips/kernel/irq
  
  /*
   * IRQ autodetection code..
  
  /*
   * IRQ autodetection code..

-diff -urN kernel-base/arch/mips/kernel/mips_ksyms.c kernel-current/arch/mips/kernel/mips_ksyms.c
---- kernel-base/arch/mips/kernel/mips_ksyms.c  2004-02-18 14:36:30.000000000 +0100
-+++ kernel-current/arch/mips/kernel/mips_ksyms.c       2005-07-10 17:55:55.738466208 +0200
+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);
 @@ -40,6 +40,12 @@
  extern long __strnlen_user_nocheck_asm(const char *s);
  extern long __strnlen_user_asm(const char *s);


@@ -2476,9 +3389,9 @@ diff -urN kernel-base/arch/mips/kernel/mips_ksyms.c kernel-current/arch/mips/ker
 +EXPORT_SYMBOL_NOVERS(prom_getenv);
 +#endif
 +
 +EXPORT_SYMBOL_NOVERS(prom_getenv);
 +#endif
 +

-diff -urN kernel-base/arch/mips/kernel/setup.c kernel-current/arch/mips/kernel/setup.c
---- kernel-base/arch/mips/kernel/setup.c       2005-07-10 03:00:44.785181224 +0200
-+++ kernel-current/arch/mips/kernel/setup.c    2005-07-10 06:40:39.590265000 +0200
+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-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);


@@ -2525,9 +3438,9 @@ diff -urN kernel-base/arch/mips/kernel/setup.c kernel-current/arch/mips/kernel/s
        default:
                panic("Unsupported architecture");
        }
        default:
                panic("Unsupported architecture");
        }

-diff -urN kernel-base/arch/mips/kernel/traps.c kernel-current/arch/mips/kernel/traps.c
---- kernel-base/arch/mips/kernel/traps.c       2005-07-10 03:00:44.786181072 +0200
-+++ kernel-current/arch/mips/kernel/traps.c    2005-07-10 06:40:39.591265000 +0200
+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-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>


@@ -2645,9 +3558,9 @@ diff -urN kernel-base/arch/mips/kernel/traps.c kernel-current/arch/mips/kernel/t
  
        per_cpu_trap_init();
  }
  
        per_cpu_trap_init();
  }

-diff -urN kernel-base/arch/mips/lib/promlib.c kernel-current/arch/mips/lib/promlib.c
---- kernel-base/arch/mips/lib/promlib.c        2005-07-10 03:00:44.786181072 +0200
-+++ kernel-current/arch/mips/lib/promlib.c     2005-07-10 06:40:39.591265000 +0200
+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-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>


@@ -2658,9 +3571,9 @@ diff -urN kernel-base/arch/mips/lib/promlib.c kernel-current/arch/mips/lib/proml
        va_end(args);
  }
 +#endif
        va_end(args);
  }
 +#endif

-diff -urN kernel-base/arch/mips/Makefile kernel-current/arch/mips/Makefile
---- kernel-base/arch/mips/Makefile     2005-07-10 03:00:44.786181072 +0200
-+++ kernel-current/arch/mips/Makefile  2005-07-10 06:40:39.591265000 +0200
+diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
+--- 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
  


@@ -2678,9 +3591,9 @@ diff -urN kernel-base/arch/mips/Makefile kernel-current/arch/mips/Makefile
  # DECstation family
  #
  ifdef CONFIG_DECSTATION
  # DECstation family
  #
  ifdef CONFIG_DECSTATION

-diff -urN kernel-base/arch/mips/mm/init.c kernel-current/arch/mips/mm/init.c
---- kernel-base/arch/mips/mm/init.c    2005-07-10 03:00:44.787180920 +0200
-+++ kernel-current/arch/mips/mm/init.c 2005-07-10 07:09:29.914216000 +0200
+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-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];


@@ -2747,9 +3660,9 @@ diff -urN kernel-base/arch/mips/mm/init.c kernel-current/arch/mips/mm/init.c
        return;
  }
 +#endif
        return;
  }
 +#endif

-diff -urN kernel-base/arch/mips/mm/tlb-r4k.c kernel-current/arch/mips/mm/tlb-r4k.c
---- kernel-base/arch/mips/mm/tlb-r4k.c 2005-07-10 03:00:44.787180920 +0200
-+++ kernel-current/arch/mips/mm/tlb-r4k.c      2005-07-10 06:40:39.592265000 +0200
+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-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>


@@ -2774,9 +3687,9 @@ diff -urN kernel-base/arch/mips/mm/tlb-r4k.c kernel-current/arch/mips/mm/tlb-r4k
 +#endif
        }
  }
 +#endif
        }
  }

-diff -urN kernel-base/drivers/char/serial.c kernel-current/drivers/char/serial.c
---- kernel-base/drivers/char/serial.c  2005-07-10 03:00:44.789180616 +0200
-+++ kernel-current/drivers/char/serial.c       2005-07-10 06:42:02.902600000 +0200
+diff -urN linux.old/drivers/char/serial.c linux.dev/drivers/char/serial.c
+--- 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;
  }


@@ -2875,9 +3788,9 @@ diff -urN kernel-base/drivers/char/serial.c kernel-current/drivers/char/serial.c
        cval = cflag & (CSIZE | CSTOPB);
  #if defined(__powerpc__) || defined(__alpha__)
        cval >>= 8;
        cval = cflag & (CSIZE | CSTOPB);
  #if defined(__powerpc__) || defined(__alpha__)
        cval >>= 8;

-diff -urN kernel-base/include/asm-mips/ar7/ar7.h kernel-current/include/asm-mips/ar7/ar7.h
---- kernel-base/include/asm-mips/ar7/ar7.h     1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/include/asm-mips/ar7/ar7.h  2005-07-10 06:40:39.622261000 +0200
+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-12 02:59:26.199667464 +0200

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


@@ -2912,9 +3825,9 @@ diff -urN kernel-base/include/asm-mips/ar7/ar7.h kernel-current/include/asm-mips
 +#define AR7_BASE_BAUD ( 3686400 / 16 )
 +
 +#endif
 +#define AR7_BASE_BAUD ( 3686400 / 16 )
 +
 +#endif

-diff -urN kernel-base/include/asm-mips/ar7/avalanche_intc.h kernel-current/include/asm-mips/ar7/avalanche_intc.h
---- kernel-base/include/asm-mips/ar7/avalanche_intc.h  1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/include/asm-mips/ar7/avalanche_intc.h       2005-07-10 06:40:39.622261000 +0200
+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-12 02:59:26.199667464 +0200

 @@ -0,0 +1,278 @@
 + /*
 + * Nitin Dhingra, iamnd@ti.com
 @@ -0,0 +1,278 @@
 + /*
 + * Nitin Dhingra, iamnd@ti.com


@@ -3194,9 +4107,9 @@ diff -urN kernel-base/include/asm-mips/ar7/avalanche_intc.h kernel-current/inclu
 +
 +
 +#endif /* _AVALANCHE_INTC_H */
 +
 +
 +#endif /* _AVALANCHE_INTC_H */

-diff -urN kernel-base/include/asm-mips/ar7/avalanche_misc.h kernel-current/include/asm-mips/ar7/avalanche_misc.h
---- kernel-base/include/asm-mips/ar7/avalanche_misc.h  1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/include/asm-mips/ar7/avalanche_misc.h       2005-07-10 18:45:35.089287296 +0200
+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-12 02:59:26.200667312 +0200

 @@ -0,0 +1,174 @@
 +#ifndef _AVALANCHE_MISC_H_
 +#define _AVALANCHE_MISC_H_
 @@ -0,0 +1,174 @@
 +#ifndef _AVALANCHE_MISC_H_
 +#define _AVALANCHE_MISC_H_


@@ -3372,9 +4285,9 @@ diff -urN kernel-base/include/asm-mips/ar7/avalanche_misc.h kernel-current/inclu
 +unsigned int avalanche_is_mdix_on_chip(void);
 +
 +#endif
 +unsigned int avalanche_is_mdix_on_chip(void);
 +
 +#endif

-diff -urN kernel-base/include/asm-mips/ar7/avalanche_regs.h kernel-current/include/asm-mips/ar7/avalanche_regs.h
---- kernel-base/include/asm-mips/ar7/avalanche_regs.h  1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/include/asm-mips/ar7/avalanche_regs.h       2005-07-10 18:48:26.333254256 +0200
+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-12 02:59:26.201667160 +0200

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


@@ -3943,9 +4856,9 @@ diff -urN kernel-base/include/asm-mips/ar7/avalanche_regs.h kernel-current/inclu
 +
 +
 +
 +
 +
 +

-diff -urN kernel-base/include/asm-mips/ar7/if_port.h kernel-current/include/asm-mips/ar7/if_port.h
---- kernel-base/include/asm-mips/ar7/if_port.h 1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/include/asm-mips/ar7/if_port.h      2005-07-10 06:40:39.623260000 +0200
+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-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                                      


@@ -3973,9 +4886,9 @@ diff -urN kernel-base/include/asm-mips/ar7/if_port.h kernel-current/include/asm-
 +
 +
 +#endif /* _IF_PORT_H_ */
 +
 +
 +#endif /* _IF_PORT_H_ */

-diff -urN kernel-base/include/asm-mips/ar7/sangam_boards.h kernel-current/include/asm-mips/ar7/sangam_boards.h
---- kernel-base/include/asm-mips/ar7/sangam_boards.h   1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/include/asm-mips/ar7/sangam_boards.h        2005-07-10 06:40:39.623260000 +0200
+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-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


@@ -4054,9 +4967,9 @@ diff -urN kernel-base/include/asm-mips/ar7/sangam_boards.h kernel-current/includ
 +
 +
 +#endif
 +
 +
 +#endif

-diff -urN kernel-base/include/asm-mips/ar7/sangam.h kernel-current/include/asm-mips/ar7/sangam.h
---- kernel-base/include/asm-mips/ar7/sangam.h  1970-01-01 01:00:00.000000000 +0100
-+++ kernel-current/include/asm-mips/ar7/sangam.h       2005-07-10 06:40:39.624260000 +0200
+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-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_


@@ -4238,9 +5151,640 @@ diff -urN kernel-base/include/asm-mips/ar7/sangam.h kernel-current/include/asm-m
 +#include "sangam_boards.h"
 +
 +#endif /*_SANGAM_H_ */
 +#include "sangam_boards.h"
 +
 +#endif /*_SANGAM_H_ */

-diff -urN kernel-base/include/asm-mips/io.h kernel-current/include/asm-mips/io.h
---- kernel-base/include/asm-mips/io.h  2005-07-10 03:00:44.797179400 +0200
-+++ kernel-current/include/asm-mips/io.h       2005-07-10 06:40:39.624260000 +0200
+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-12 03:01:26.109438408 +0200
+@@ -0,0 +1,42 @@
++/******************************************************************************
++ * FILE PURPOSE:    TNETD73xx Error Definations Header File
++ ******************************************************************************
++ * FILE NAME:       tnetd73xx_err.h
++ *
++ * DESCRIPTION:     Error definations for TNETD73XX
++ *
++ * REVISION HISTORY:
++ * 27 Nov 02 - PSP TII  
++ *
++ * (C) Copyright 2002, Texas Instruments, Inc
++ *******************************************************************************/
++
++ 
++#ifndef __TNETD73XX_ERR_H__
++#define __TNETD73XX_ERR_H__
++
++typedef enum TNETD73XX_ERR_t
++{
++    TNETD73XX_ERR_OK        = 0,    /* OK or SUCCESS */
++    TNETD73XX_ERR_ERROR     = -1,   /* Unspecified/Generic ERROR */
++
++    /* Pointers and args */
++    TNETD73XX_ERR_INVARG        = -2,   /* Invaild argument to the call */
++    TNETD73XX_ERR_NULLPTR       = -3,   /* NULL pointer */
++    TNETD73XX_ERR_BADPTR        = -4,   /* Bad (out of mem) pointer */
++
++    /* Memory issues */
++    TNETD73XX_ERR_ALLOC_FAIL    = -10,  /* allocation failed */
++    TNETD73XX_ERR_FREE_FAIL     = -11,  /* free failed */
++    TNETD73XX_ERR_MEM_CORRUPT   = -12,  /* corrupted memory */
++    TNETD73XX_ERR_BUF_LINK      = -13,  /* buffer linking failed */
++
++    /* Device issues */
++    TNETD73XX_ERR_DEVICE_TIMEOUT    = -20,  /* device timeout on read/write */
++    TNETD73XX_ERR_DEVICE_MALFUNC    = -21,  /* device malfunction */
++
++    TNETD73XX_ERR_INVID     = -30   /* Invalid ID */
++
++} TNETD73XX_ERR;
++
++#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-12 03:01:26.110438256 +0200
+@@ -0,0 +1,338 @@
++/******************************************************************************
++ * FILE PURPOSE:    TNETD73xx Common Header File
++ ******************************************************************************
++ * FILE NAME:       tnetd73xx.h
++ *
++ * DESCRIPTION:     shared typedef's, constants and API for TNETD73xx
++ *
++ * REVISION HISTORY:
++ * 27 Nov 02 - PSP TII  
++ *
++ * (C) Copyright 2002, Texas Instruments, Inc
++ *******************************************************************************/
++
++/*
++ *
++ *
++ *   These are const, typedef, and api definitions for tnetd73xx.
++ *
++ *   NOTES:
++ *   1. This file may be included into both C and Assembly files.
++ *       - for .s files, please do #define _ASMLANGUAGE in your ASM file to
++ *           avoid C data types (typedefs) below;
++ *       - for .c files, you don't have to do anything special.
++ *
++ *   2. This file has a number of sections for each SOC subsystem. When adding
++ *       a new constant, find the subsystem you are working on and follow the
++ *       name pattern. If you are adding another typedef for your interface, please,
++ *       place it with other typedefs and function prototypes.
++ *
++ *   3. Please, DO NOT add any macros or types that are local to a subsystem to avoid
++ *       cluttering. Include such items directly into the module's .c file or have a
++ *       local .h file to pass data between smaller modules. This file defines only
++ *       shared items.
++ */
++
++#ifndef __TNETD73XX_H__
++#define __TNETD73XX_H__
++
++#ifndef _ASMLANGUAGE        /* This part not for assembly language */
++
++extern unsigned int tnetd73xx_mips_freq;
++extern unsigned int tnetd73xx_vbus_freq;
++
++#include "tnetd73xx_err.h"
++
++#endif /* _ASMLANGUAGE */
++
++
++/*******************************************************************************************
++*   Emerald core specific
++******************************************************************************************** */
++
++#ifdef  BIG_ENDIAN
++#elif defined(LITTLE_ENDIAN)
++#else
++#error Need to define endianism
++#endif
++
++#ifndef KSEG_MSK
++#define KSEG_MSK                    0xE0000000 /* Most significant 3 bits denote kseg choice */
++#endif
++
++#ifndef KSEG_INV_MASK
++#define KSEG_INV_MASK               0x1FFFFFFF /* Inverted mask for kseg address */
++#endif
++
++#ifndef KSEG0_BASE
++#define KSEG0_BASE                  0x80000000
++#endif
++
++#ifndef KSEG1_BASE
++#define KSEG1_BASE                  0xA0000000
++#endif
++
++#ifndef KSEG0
++#define KSEG0(addr)                 (((__u32)(addr) & ~KSEG_MSK) | KSEG0_BASE)
++#endif
++
++#ifndef KSEG1
++#define KSEG1(addr)                 (((__u32)(addr) & ~KSEG_MSK) | KSEG1_BASE)
++#endif
++
++#ifndef KUSEG
++#define KUSEG(addr)                 ((__u32)(addr) & ~KSEG_MSK)
++#endif
++
++#ifndef PHYS_ADDR
++#define PHYS_ADDR(addr)             ((addr) & KSEG_INV_MASK)
++#endif
++
++#ifndef PHYS_TO_K0
++#define PHYS_TO_K0(addr)            (PHYS_ADDR(addr)|KSEG0_BASE)
++#endif
++
++#ifndef PHYS_TO_K1
++#define PHYS_TO_K1(addr)            (PHYS_ADDR(addr)|KSEG1_BASE)
++#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_WRITE(addr, data)      REG8_DATA(addr) = data;
++#define REG8_READ(addr, data)       data = (__u8) REG8_DATA(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_WRITE(addr, data)     REG16_DATA(addr) = data;
++#define REG16_READ(addr, data)      data = (__u16) REG16_DATA(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_WRITE(addr, data)     REG32_DATA(addr) = data;
++#define REG32_READ(addr, data)      data = (__u32) REG32_DATA(addr);
++#endif
++
++#ifdef  _LINK_KSEG0_                /* Application is linked into KSEG0 space */
++#define VIRT_ADDR(addr)             PHYS_TO_K0(PHYS_ADDR(addr))
++#endif
++
++#ifdef  _LINK_KSEG1_                /* Application is linked into KSEG1 space */
++#define VIRT_ADDR(addr)             PHYS_TO_K1(PHYS_ADDR(addr))
++#endif
++
++#if !defined(_LINK_KSEG0_) && !defined(_LINK_KSEG1_)
++#error  You must define _LINK_KSEG0_ or _LINK_KSEG1_ to compile the code.
++#endif
++
++/* TNETD73XX chip definations */
++
++#define FREQ_1MHZ                       1000000
++#define TNETD73XX_MIPS_FREQ             tnetd73xx_mips_freq /* CPU clock frequency */
++#define TNETD73XX_VBUS_FREQ             tnetd73xx_vbus_freq /* originally (TNETD73XX_MIPS_FREQ/2) */
++
++#ifdef AR7SEAD2
++#define TNETD73XX_MIPS_FREQ_DEFAULT     25000000       /* 25 Mhz for sead2 board crystal */
++#else
++#define TNETD73XX_MIPS_FREQ_DEFAULT     125000000      /* 125 Mhz */
++#endif
++#define TNETD73XX_VBUS_FREQ_DEFAULT     (TNETD73XX_MIPS_FREQ_DEFAULT / 2) /* Sync mode */
++
++
++
++/* Module base addresses */
++#define TNETD73XX_ADSLSS_BASE               PHYS_TO_K1(0x01000000)      /* ADSLSS Module */
++#define TNETD73XX_BBIF_CTRL_BASE            PHYS_TO_K1(0x02000000)      /* BBIF Control */
++#define TNETD73XX_ATMSAR_BASE               PHYS_TO_K1(0x03000000)      /* ATM SAR */
++#define TNETD73XX_USB_BASE                  PHYS_TO_K1(0x03400000)      /* USB Module */
++#define TNETD73XX_VLYNQ0_BASE               PHYS_TO_K1(0x04000000)      /* VLYNQ0 Module */
++#define TNETD73xx_EMAC0_BASE                PHYS_TO_K1(0x08610000)      /* EMAC0 Module*/
++#define TNETD73XX_EMIF_BASE                 PHYS_TO_K1(0x08610800)      /* EMIF Module */
++#define TNETD73XX_GPIO_BASE                 PHYS_TO_K1(0x08610900)      /* GPIO control */
++#define TNETD73XX_CLOCK_CTRL_BASE           PHYS_TO_K1(0x08610A00)      /* Clock Control */
++#define TNETD73XX_WDTIMER_BASE              PHYS_TO_K1(0x08610B00)      /* WDTIMER Module */
++#define TNETD73XX_TIMER0_BASE               PHYS_TO_K1(0x08610C00)      /* TIMER0 Module */
++#define TNETD73XX_TIMER1_BASE               PHYS_TO_K1(0x08610D00)      /* TIMER1 Module */
++#define TNETD73XX_UARTA_BASE                PHYS_TO_K1(0x08610E00)      /* UART A */
++#define TNETD73XX_UARTB_BASE                PHYS_TO_K1(0x08610F00)      /* UART B */
++#define TNETD73XX_I2C_BASE                  PHYS_TO_K1(0x08611000)      /* I2C Module */
++#define TNETD73XX_USB_DMA_BASE              PHYS_TO_K1(0x08611200)      /* USB Module */
++#define TNETD73XX_MCDMA_BASE                PHYS_TO_K1(0x08611400)      /* MC-DMA */
++#define TNETD73xx_VDMAVT_BASE               PHYS_TO_K1(0x08611500)      /* VDMAVT Control */
++#define TNETD73XX_RST_CTRL_BASE             PHYS_TO_K1(0x08611600)      /* Reset Control */
++#define TNETD73xx_BIST_CTRL_BASE            PHYS_TO_K1(0x08611700)      /* BIST Control */
++#define TNETD73xx_VLYNQ0_CTRL_BASE          PHYS_TO_K1(0x08611800)      /* VLYNQ0 Control */
++#define TNETD73XX_DCL_BASE                  PHYS_TO_K1(0x08611A00)      /* Device Configuration Latch */
++#define TNETD73xx_VLYNQ1_CTRL_BASE          PHYS_TO_K1(0x08611C00)      /* VLYNQ1 Control */
++#define TNETD73xx_MDIO_BASE                 PHYS_TO_K1(0x08611E00)      /* MDIO Control */
++#define TNETD73XX_FSER_BASE                 PHYS_TO_K1(0x08612000)      /* FSER Control */
++#define TNETD73XX_INTC_BASE                 PHYS_TO_K1(0x08612400)      /* Interrupt Controller */
++#define TNETD73xx_EMAC1_BASE                PHYS_TO_K1(0x08612800)      /* EMAC1 Module*/
++#define TNETD73XX_VLYNQ1_BASE               PHYS_TO_K1(0x0C000000)      /* VLYNQ1 Module */
++
++/* BBIF Registers */
++#define TNETD73XX_BBIF_ADSLADR              (TNETD73XX_BBIF_CTRL_BASE + 0x0)
++
++/* Device Configuration Latch Registers */
++#define TNETD73XX_DCL_BOOTCR                (TNETD73XX_DCL_BASE + 0x0)
++#define TNETD73XX_DCL_DPLLSELR              (TNETD73XX_DCL_BASE + 0x10)
++#define TNETD73XX_DCL_SPEEDCTLR             (TNETD73XX_DCL_BASE + 0x14)
++#define TNETD73XX_DCL_SPEEDPWDR             (TNETD73XX_DCL_BASE + 0x18)
++#define TNETD73XX_DCL_SPEEDCAPR             (TNETD73XX_DCL_BASE + 0x1C)
++
++/* GPIO Control */
++#define TNETD73XX_GPIODINR                  (TNETD73XX_GPIO_BASE + 0x0)
++#define TNETD73XX_GPIODOUTR                 (TNETD73XX_GPIO_BASE + 0x4)
++#define TNETD73XX_GPIOPDIRR                 (TNETD73XX_GPIO_BASE + 0x8)
++#define TNETD73XX_GPIOENR                   (TNETD73XX_GPIO_BASE + 0xC)
++#define TNETD73XX_CVR                       (TNETD73XX_GPIO_BASE + 0x14)
++#define TNETD73XX_DIDR1                     (TNETD73XX_GPIO_BASE + 0x18)
++#define TNETD73XX_DIDR2                     (TNETD73XX_GPIO_BASE + 0x1C)
++
++/* Reset Control  */
++#define TNETD73XX_RST_CTRL_PRCR             (TNETD73XX_RST_CTRL_BASE + 0x0)
++#define TNETD73XX_RST_CTRL_SWRCR            (TNETD73XX_RST_CTRL_BASE + 0x4)
++#define TNETD73XX_RST_CTRL_RSR              (TNETD73XX_RST_CTRL_BASE + 0x8)
++
++/* Power Control  */
++#define TNETD73XX_POWER_CTRL_PDCR           (TNETD73XX_CLOCK_CTRL_BASE + 0x0)
++#define TNETD73XX_POWER_CTRL_PCLKCR         (TNETD73XX_CLOCK_CTRL_BASE + 0x4)
++#define TNETD73XX_POWER_CTRL_PDUCR          (TNETD73XX_CLOCK_CTRL_BASE + 0x8)
++#define TNETD73XX_POWER_CTRL_WKCR           (TNETD73XX_CLOCK_CTRL_BASE + 0xC)
++
++/* Clock Control */
++#define TNETD73XX_CLK_CTRL_SCLKCR           (TNETD73XX_CLOCK_CTRL_BASE + 0x20)
++#define TNETD73XX_CLK_CTRL_SCLKPLLCR        (TNETD73XX_CLOCK_CTRL_BASE + 0x30)
++#define TNETD73XX_CLK_CTRL_MCLKCR           (TNETD73XX_CLOCK_CTRL_BASE + 0x40)
++#define TNETD73XX_CLK_CTRL_MCLKPLLCR        (TNETD73XX_CLOCK_CTRL_BASE + 0x50)
++#define TNETD73XX_CLK_CTRL_UCLKCR           (TNETD73XX_CLOCK_CTRL_BASE + 0x60)
++#define TNETD73XX_CLK_CTRL_UCLKPLLCR        (TNETD73XX_CLOCK_CTRL_BASE + 0x70)
++#define TNETD73XX_CLK_CTRL_ACLKCR0          (TNETD73XX_CLOCK_CTRL_BASE + 0x80)
++#define TNETD73XX_CLK_CTRL_ACLKPLLCR0       (TNETD73XX_CLOCK_CTRL_BASE + 0x90)
++#define TNETD73XX_CLK_CTRL_ACLKCR1          (TNETD73XX_CLOCK_CTRL_BASE + 0xA0)
++#define TNETD73XX_CLK_CTRL_ACLKPLLCR1       (TNETD73XX_CLOCK_CTRL_BASE + 0xB0)
++
++/* EMIF control */
++#define TNETD73XX_EMIF_SDRAM_CFG              ( TNETD73XX_EMIF_BASE + 0x08 )                
++
++/* UART */
++#ifdef AR7SEAD2
++#define TNETD73XX_UART_FREQ                 3686400
++#else
++#define TNETD73XX_UART_FREQ                 TNETD73XX_VBUS_FREQ
++#endif
++
++/* Interrupt Controller */
++
++/* Primary interrupts */
++#define TNETD73XX_INTC_UNIFIED_SECONDARY    0   /* Unified secondary interrupt */
++#define TNETD73XX_INTC_EXTERNAL0            1   /* External Interrupt Line 0 */
++#define TNETD73XX_INTC_EXTERNAL1            2   /* External Interrupt Line 1 */
++#define TNETD73XX_INTC_RESERVED3            3   /* Reserved */
++#define TNETD73XX_INTC_RESERVED4            4   /* Reserved */
++#define TNETD73XX_INTC_TIMER0               5   /* TIMER 0 int */
++#define TNETD73XX_INTC_TIMER1               6   /* TIMER 1 int */
++#define TNETD73XX_INTC_UART0                7   /* UART 0 int */
++#define TNETD73XX_INTC_UART1                8   /* UART 1 int */
++#define TNETD73XX_INTC_MCDMA0               9   /* MCDMA 0 int */
++#define TNETD73XX_INTC_MCDMA1               10  /* MCDMA 1 int */
++#define TNETD73XX_INTC_RESERVED11           11  /* Reserved */
++#define TNETD73XX_INTC_RESERVED12           12  /* Reserved */
++#define TNETD73XX_INTC_RESERVED13           13  /* Reserved */
++#define TNETD73XX_INTC_RESERVED14           14  /* Reserved */
++#define TNETD73XX_INTC_ATMSAR               15  /* ATM SAR int */
++#define TNETD73XX_INTC_RESERVED16           16  /* Reserved */
++#define TNETD73XX_INTC_RESERVED17           17  /* Reserved */
++#define TNETD73XX_INTC_RESERVED18           18  /* Reserved */
++#define TNETD73XX_INTC_EMAC0                19  /* EMAC 0 int */
++#define TNETD73XX_INTC_RESERVED20           20  /* Reserved */
++#define TNETD73XX_INTC_VLYNQ0               21  /* VLYNQ 0 int */
++#define TNETD73XX_INTC_CODEC                22  /* CODEC int */
++#define TNETD73XX_INTC_RESERVED23           23  /* Reserved */
++#define TNETD73XX_INTC_USBSLAVE             24  /* USB Slave int */
++#define TNETD73XX_INTC_VLYNQ1               25  /* VLYNQ 1 int */
++#define TNETD73XX_INTC_RESERVED26           26  /* Reserved */
++#define TNETD73XX_INTC_RESERVED27           27  /* Reserved */
++#define TNETD73XX_INTC_ETH_PHY              28  /* Ethernet PHY   */
++#define TNETD73XX_INTC_I2C                  29  /* I2C int */
++#define TNETD73XX_INTC_MCDMA2               30  /* MCDMA 2 int */
++#define TNETD73XX_INTC_MCDMA3               31  /* MCDMA 3 int */
++#define TNETD73XX_INTC_RESERVED32           32  /* Reserved */
++#define TNETD73XX_INTC_EMAC1                33  /* EMAC 1 int */
++#define TNETD73XX_INTC_RESERVED34           34  /* Reserved */
++#define TNETD73XX_INTC_RESERVED35           35  /* Reserved */
++#define TNETD73XX_INTC_RESERVED36           36  /* Reserved */
++#define TNETD73XX_INTC_VDMAVTRX             37  /* VDMAVTRX */
++#define TNETD73XX_INTC_VDMAVTTX             38  /* VDMAVTTX */
++#define TNETD73XX_INTC_ADSLSS               39  /* ADSLSS */
++
++/* Secondary interrupts */
++#define TNETD73XX_INTC_SEC0                 40  /* Secondary */
++#define TNETD73XX_INTC_SEC1                 41  /* Secondary */
++#define TNETD73XX_INTC_SEC2                 42  /* Secondary */
++#define TNETD73XX_INTC_SEC3                 43  /* Secondary */
++#define TNETD73XX_INTC_SEC4                 44  /* Secondary */
++#define TNETD73XX_INTC_SEC5                 45  /* Secondary */
++#define TNETD73XX_INTC_SEC6                 46  /* Secondary */
++#define TNETD73XX_INTC_EMIF                 47  /* EMIF */
++#define TNETD73XX_INTC_SEC8                 48  /* Secondary */
++#define TNETD73XX_INTC_SEC9                 49  /* Secondary */
++#define TNETD73XX_INTC_SEC10                50  /* Secondary */
++#define TNETD73XX_INTC_SEC11                51  /* Secondary */
++#define TNETD73XX_INTC_SEC12                52  /* Secondary */
++#define TNETD73XX_INTC_SEC13                53  /* Secondary */
++#define TNETD73XX_INTC_SEC14                54  /* Secondary */
++#define TNETD73XX_INTC_SEC15                55  /* Secondary */
++#define TNETD73XX_INTC_SEC16                56  /* Secondary */
++#define TNETD73XX_INTC_SEC17                57  /* Secondary */
++#define TNETD73XX_INTC_SEC18                58  /* Secondary */
++#define TNETD73XX_INTC_SEC19                59  /* Secondary */
++#define TNETD73XX_INTC_SEC20                60  /* Secondary */
++#define TNETD73XX_INTC_SEC21                61  /* Secondary */
++#define TNETD73XX_INTC_SEC22                62  /* Secondary */
++#define TNETD73XX_INTC_SEC23                63  /* Secondary */
++#define TNETD73XX_INTC_SEC24                64  /* Secondary */
++#define TNETD73XX_INTC_SEC25                65  /* Secondary */
++#define TNETD73XX_INTC_SEC26                66  /* Secondary */
++#define TNETD73XX_INTC_SEC27                67  /* Secondary */
++#define TNETD73XX_INTC_SEC28                68  /* Secondary */
++#define TNETD73XX_INTC_SEC29                69  /* Secondary */
++#define TNETD73XX_INTC_SEC30                70  /* Secondary */
++#define TNETD73XX_INTC_SEC31                71  /* Secondary */
++
++/* These ugly macros are to access the -1 registers, like config1 */
++#define MFC0_SEL1_OPCODE(dst, src)\
++        .word (0x40000000 | ((dst)<<16) | ((src)<<11) | 1);\
++        nop; \
++        nop; \
++        nop
++
++#define MTC0_SEL1_OPCODE(dst, src)\
++        .word (0x40800000 | ((dst)<<16) | ((src)<<11) | 1);\
++        nop; \
++        nop; \
++        nop
++
++
++/* Below are Jade core specific */
++#define CFG0_4K_IL_MASK         0x00380000
++#define CFG0_4K_IL_SHIFT        19
++#define CFG0_4K_IA_MASK         0x00070000
++#define CFG0_4K_IA_SHIFT        16
++#define CFG0_4K_IS_MASK         0x01c00000
++#define CFG0_4K_IS_SHIFT        22
++
++#define CFG0_4K_DL_MASK         0x00001c00
++#define CFG0_4K_DL_SHIFT        10
++#define CFG0_4K_DA_MASK         0x00000380
++#define CFG0_4K_DA_SHIFT        7
++#define CFG0_4K_DS_MASK         0x0000E000
++#define CFG0_4K_DS_SHIFT        13
++
++
++
++#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-12 03:01:26.110438256 +0200
+@@ -0,0 +1,239 @@
++/******************************************************************************
++ * FILE PURPOSE:    TNETD73xx Misc modules API Header
++ ******************************************************************************
++ * FILE NAME:       tnetd73xx_misc.h
++ *
++ * DESCRIPTION:     Clock Control, Reset Control, Power Management, GPIO
++ *                  FSER Modules API 
++ *                  As per TNETD73xx specifications
++ *
++ * REVISION HISTORY:
++ * 27 Nov 02 - Sharath Kumar     PSP TII  
++ * 14 Feb 03 - Anant Gole        PSP TII
++ *
++ * (C) Copyright 2002, Texas Instruments, Inc
++ *******************************************************************************/
++
++#ifndef __TNETD73XX_MISC_H__
++#define __TNETD73XX_MISC_H__
++
++/*****************************************************************************
++ * Reset Control Module
++ *****************************************************************************/
++ 
++typedef enum TNETD73XX_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
++} TNETD73XX_RESET_MODULE_T;
++
++typedef enum TNETD73XX_RESET_CTRL_tag
++{
++    IN_RESET        = 0,
++    OUT_OF_RESET
++} TNETD73XX_RESET_CTRL_T;
++
++typedef enum TNETD73XX_SYS_RST_MODE_tag
++{
++    RESET_SOC_WITH_MEMCTRL      = 1,    /* SW0 bit in SWRCR register */
++    RESET_SOC_WITHOUT_MEMCTRL   = 2     /* SW1 bit in SWRCR register */
++} TNETD73XX_SYS_RST_MODE_T;
++
++typedef enum TNETD73XX_SYS_RESET_STATUS_tag
++{
++    HARDWARE_RESET = 0,
++    SOFTWARE_RESET0,            /* Caused by writing 1 to SW0 bit in SWRCR register */
++    WATCHDOG_RESET,
++    SOFTWARE_RESET1             /* Caused by writing 1 to SW1 bit in SWRCR register */
++} TNETD73XX_SYS_RESET_STATUS_T;
++
++void tnetd73xx_reset_ctrl(TNETD73XX_RESET_MODULE_T reset_module, 
++                                TNETD73XX_RESET_CTRL_T reset_ctrl);
++TNETD73XX_RESET_CTRL_T tnetd73xx_get_reset_status(TNETD73XX_RESET_MODULE_T reset_module);
++void tnetd73xx_sys_reset(TNETD73XX_SYS_RST_MODE_T mode);
++TNETD73XX_SYS_RESET_STATUS_T tnetd73xx_get_sys_last_reset_status(void);
++                    
++/*****************************************************************************
++ * Power Control Module
++ *****************************************************************************/
++
++typedef enum TNETD73XX_POWER_MODULE_tag
++{
++    POWER_MODULE_USBSP      = 0,
++    POWER_MODULE_WDTP       = 1,
++    POWER_MODULE_UT0P       = 2,
++    POWER_MODULE_UT1P       = 3,
++    POWER_MODULE_IICP       = 4,
++    POWER_MODULE_VDMAP      = 5,
++    POWER_MODULE_GPIOP      = 6,
++    POWER_MODULE_VLYNQ1P    = 7,
++    POWER_MODULE_SARP       = 8,
++    POWER_MODULE_ADSLP      = 9,
++    POWER_MODULE_EMIFP      = 10,
++    POWER_MODULE_ADSPP      = 12,
++    POWER_MODULE_RAMP       = 13,
++    POWER_MODULE_ROMP       = 14,
++    POWER_MODULE_DMAP       = 15,
++    POWER_MODULE_BISTP      = 16,
++    POWER_MODULE_TIMER0P    = 18,
++    POWER_MODULE_TIMER1P    = 19,
++    POWER_MODULE_EMAC0P     = 20,
++    POWER_MODULE_EMAC1P     = 22,
++    POWER_MODULE_EPHYP      = 24,
++    POWER_MODULE_VLYNQ0P    = 27,
++} TNETD73XX_POWER_MODULE_T;
++
++typedef enum TNETD73XX_POWER_CTRL_tag
++{
++    POWER_CTRL_POWER_UP = 0,
++    POWER_CTRL_POWER_DOWN
++} TNETD73XX_POWER_CTRL_T;
++
++typedef enum TNETD73XX_SYS_POWER_MODE_tag
++{
++    GLOBAL_POWER_MODE_RUN       = 0,    /* All system is up */
++    GLOBAL_POWER_MODE_IDLE,             /* MIPS is power down, all peripherals working */
++    GLOBAL_POWER_MODE_STANDBY,          /* Chip in power down, but clock to ADSKL subsystem is running */
++    GLOBAL_POWER_MODE_POWER_DOWN        /* Total chip is powered down */
++} TNETD73XX_SYS_POWER_MODE_T;
++
++void tnetd73xx_power_ctrl(TNETD73XX_POWER_MODULE_T power_module,  TNETD73XX_POWER_CTRL_T power_ctrl);
++TNETD73XX_POWER_CTRL_T tnetd73xx_get_pwr_status(TNETD73XX_POWER_MODULE_T power_module);
++void tnetd73xx_set_global_pwr_mode(TNETD73XX_SYS_POWER_MODE_T power_mode);
++TNETD73XX_SYS_POWER_MODE_T tnetd73xx_get_global_pwr_mode(void);
++
++/*****************************************************************************
++ * Wakeup Control 
++ *****************************************************************************/
++
++typedef enum TNETD73XX_WAKEUP_INTERRUPT_tag
++{
++    WAKEUP_INT0 = 1,
++    WAKEUP_INT1 = 2,
++    WAKEUP_INT2 = 4,
++    WAKEUP_INT3 = 8
++} TNETD73XX_WAKEUP_INTERRUPT_T;
++
++typedef enum TNETD73XX_WAKEUP_CTRL_tag
++{
++    WAKEUP_DISABLED = 0,
++    WAKEUP_ENABLED
++} TNETD73XX_WAKEUP_CTRL_T;
++
++typedef enum TNETD73XX_WAKEUP_POLARITY_tag
++{
++    WAKEUP_ACTIVE_HIGH = 0,
++    WAKEUP_ACTIVE_LOW
++} TNETD73XX_WAKEUP_POLARITY_T;
++
++void tnetd73xx_wakeup_ctrl(TNETD73XX_WAKEUP_INTERRUPT_T wakeup_int, 
++                           TNETD73XX_WAKEUP_CTRL_T wakeup_ctrl, 
++                           TNETD73XX_WAKEUP_POLARITY_T wakeup_polarity);
++
++/*****************************************************************************
++ * FSER  Control 
++ *****************************************************************************/
++ 
++typedef enum TNETD73XX_FSER_MODE_tag
++{
++    FSER_I2C    = 0,
++    FSER_UART   = 1
++} TNETD73XX_FSER_MODE_T;
++
++void tnetd73xx_fser_ctrl(TNETD73XX_FSER_MODE_T fser_mode);
++
++/*****************************************************************************
++ * Clock Control 
++ *****************************************************************************/
++
++#define CLK_MHZ(x)    ( (x) * 1000000 )
++
++typedef enum TNETD73XX_CLKC_ID_tag
++{
++    CLKC_SYS = 0,
++    CLKC_MIPS,
++    CLKC_USB,
++    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);
++
++/*****************************************************************************
++ * GPIO Control 
++ *****************************************************************************/
++
++typedef enum TNETD73XX_GPIO_PIN_tag
++{
++    GPIO_UART0_RD           = 0,
++    GPIO_UART0_TD           = 1,
++    GPIO_UART0_RTS          = 2,
++    GPIO_UART0_CTS          = 3,
++    GPIO_FSER_CLK           = 4,
++    GPIO_FSER_D             = 5,
++    GPIO_EXT_AFE_SCLK       = 6,
++    GPIO_EXT_AFE_TX_FS      = 7,
++    GPIO_EXT_AFE_TXD        = 8,
++    GPIO_EXT_AFE_RS_FS      = 9,
++    GPIO_EXT_AFE_RXD1       = 10,
++    GPIO_EXT_AFE_RXD0       = 11,
++    GPIO_EXT_AFE_CDIN       = 12,
++    GPIO_EXT_AFE_CDOUT      = 13,
++    GPIO_EPHY_SPEED100      = 14,
++    GPIO_EPHY_LINKON        = 15,
++    GPIO_EPHY_ACTIVITY      = 16,
++    GPIO_EPHY_FDUPLEX       = 17,
++    GPIO_EINT0              = 18,
++    GPIO_EINT1              = 19,
++    GPIO_MBSP0_TCLK         = 20,
++    GPIO_MBSP0_RCLK         = 21,
++    GPIO_MBSP0_RD           = 22,
++    GPIO_MBSP0_TD           = 23,
++    GPIO_MBSP0_RFS          = 24,
++    GPIO_MBSP0_TFS          = 25,
++    GPIO_MII_DIO            = 26,
++    GPIO_MII_DCLK           = 27,
++} TNETD73XX_GPIO_PIN_T;
++
++typedef enum TNETD73XX_GPIO_PIN_MODE_tag
++{
++    FUNCTIONAL_PIN = 0,
++    GPIO_PIN = 1
++} TNETD73XX_GPIO_PIN_MODE_T;
++
++typedef enum TNETD73XX_GPIO_PIN_DIRECTION_tag
++{
++    GPIO_OUTPUT_PIN = 0,
++    GPIO_INPUT_PIN = 1
++} TNETD73XX_GPIO_PIN_DIRECTION_T;
++ 
++void tnetd73xx_gpio_init(void);
++void tnetd73xx_gpio_ctrl(TNETD73XX_GPIO_PIN_T gpio_pin, 
++                         TNETD73XX_GPIO_PIN_MODE_T pin_mode,
++                         TNETD73XX_GPIO_PIN_DIRECTION_T pin_direction);
++void tnetd73xx_gpio_out(TNETD73XX_GPIO_PIN_T gpio_pin, int value);
++int tnetd73xx_gpio_in(TNETD73XX_GPIO_PIN_T gpio_pin);
++
++/* TNETD73XX Revision */
++__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
+--- 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)


@@ -4254,9 +5798,9 @@ diff -urN kernel-base/include/asm-mips/io.h kernel-current/include/asm-mips/io.h
  
  #define IO_SPACE_LIMIT 0xffff
  
  
  #define IO_SPACE_LIMIT 0xffff
  

-diff -urN kernel-base/include/asm-mips/irq.h kernel-current/include/asm-mips/irq.h
---- kernel-base/include/asm-mips/irq.h 2005-07-10 03:00:44.798179248 +0200
-+++ kernel-current/include/asm-mips/irq.h      2005-07-10 06:40:39.624260000 +0200
+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-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>


@@ -4270,9 +5814,9 @@ diff -urN kernel-base/include/asm-mips/irq.h kernel-current/include/asm-mips/irq
  
  #ifdef CONFIG_I8259
  static inline int irq_cannonicalize(int irq)
  
  #ifdef CONFIG_I8259
  static inline int irq_cannonicalize(int irq)

-diff -urN kernel-base/include/asm-mips/page.h kernel-current/include/asm-mips/page.h
---- kernel-base/include/asm-mips/page.h        2005-07-10 03:00:44.798179248 +0200
-+++ kernel-current/include/asm-mips/page.h     2005-07-10 06:40:39.625260000 +0200
+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-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)


@@ -4285,9 +5829,9 @@ diff -urN kernel-base/include/asm-mips/page.h kernel-current/include/asm-mips/pa
  #define VALID_PAGE(page)      ((page - mem_map) < max_mapnr)
  
  #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
  #define VALID_PAGE(page)      ((page - mem_map) < max_mapnr)
  
  #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \

-diff -urN kernel-base/include/asm-mips/pgtable-32.h kernel-current/include/asm-mips/pgtable-32.h
---- kernel-base/include/asm-mips/pgtable-32.h  2005-07-10 03:00:44.798179248 +0200
-+++ kernel-current/include/asm-mips/pgtable-32.h       2005-07-10 06:40:39.625260000 +0200
+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-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.
   */


@@ -4328,9 +5872,9 @@ diff -urN kernel-base/include/asm-mips/pgtable-32.h kernel-current/include/asm-m
  #define pte_page(x)  (mem_map+((unsigned long)(((x).pte_low >> (PAGE_SHIFT+2)))))
  #define __mk_pte(page_nr,pgprot) __pte(((page_nr) << (PAGE_SHIFT+2)) | pgprot_val(pgprot))
  #else
  #define pte_page(x)  (mem_map+((unsigned long)(((x).pte_low >> (PAGE_SHIFT+2)))))
  #define __mk_pte(page_nr,pgprot) __pte(((page_nr) << (PAGE_SHIFT+2)) | pgprot_val(pgprot))
  #else

-diff -urN kernel-base/include/asm-mips/serial.h kernel-current/include/asm-mips/serial.h
---- kernel-base/include/asm-mips/serial.h      2005-07-10 03:00:44.799179096 +0200
-+++ kernel-current/include/asm-mips/serial.h   2005-07-10 06:40:39.625260000 +0200
+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-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)


@@ -4355,9 +5899,9 @@ diff -urN kernel-base/include/asm-mips/serial.h kernel-current/include/asm-mips/
        ATLAS_SERIAL_PORT_DEFNS                 \
        AU1000_SERIAL_PORT_DEFNS                \
        COBALT_SERIAL_PORT_DEFNS                \
        ATLAS_SERIAL_PORT_DEFNS                 \
        AU1000_SERIAL_PORT_DEFNS                \
        COBALT_SERIAL_PORT_DEFNS                \

-diff -urN kernel-base/Makefile kernel-current/Makefile
---- kernel-base/Makefile       2005-07-10 03:00:44.799179096 +0200
-+++ kernel-current/Makefile    2005-07-10 06:40:39.626260000 +0200
+diff -urN linux.old/Makefile linux.dev/Makefile
+--- 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)

diff --git a/target/linux/linux-2.4/patches/ar7/002-led_driver.patch b/target/linux/linux-2.4/patches/ar7/002-led_driver.patch
index eb7d63d..d88fca1 100644 (file)
--- a/target/linux/linux-2.4/patches/ar7/002-led_driver.patch
+++ b/target/linux/linux-2.4/patches/ar7/002-led_driver.patch
@@ -1,7 +1,393 @@
+diff -urN linux.old/drivers/char/avalanche_led/gpio.c linux.dev/drivers/char/avalanche_led/gpio.c
+--- linux.old/drivers/char/avalanche_led/gpio.c        1970-01-01 01:00:00.000000000 +0100
++++ linux.dev/drivers/char/avalanche_led/gpio.c        2005-07-12 03:13:02.696541072 +0200
+@@ -0,0 +1,382 @@
++#include <linux/kernel.h>
++#include <asm/uaccess.h>
++#include <linux/spinlock.h>
++#include <linux/proc_fs.h>
++#include <linux/fs.h>
++#include <linux/timer.h>
++#include <linux/module.h>
++
++#include <asm/ar7/tnetd73xx_err.h>
++#include <asm/ar7/tnetd73xx_misc.h>
++#include <asm/ar7/ledapp.h>
++
++#define TRUE 1
++#define FALSE 0
++
++#if defined CONFIG_AR7WRD || defined CONFIG_AR7RD
++
++#define AR7_RESET_FILE "led_mod/ar7reset"
++#define AR7_VERSION_FILE "led_mod/hardware_version"
++#define AR7_RESET_GPIO 11
++#define RESET_POLL_TIME 1
++#define RESET_HOLD_TIME 4
++#define NO_OF_LEDS    
++
++static struct proc_dir_entry *reset_file;
++static int res_state = 0;
++static int count;
++static struct timer_list *pTimer = NULL;
++static ssize_t proc_read_reset_fops(struct file *filp,
++                                    char *buf,size_t count , loff_t *offp);
++
++static ssize_t proc_read_hwversion_fops(struct file *filp,
++                                    char *buf,size_t count , loff_t *offp);
++
++struct file_operations reset_fops = {
++                                     read: proc_read_reset_fops
++                                   };
++struct file_operations hardware_version_fops = {
++                                     read: proc_read_hwversion_fops
++                                   };
++#endif
++
++static spinlock_t     device_lock;
++led_reg_t temp[15];
++
++static void gpio_led_on( unsigned long param )
++{
++      unsigned int flags;
++
++      spin_lock_irqsave(&device_lock, flags);
++
++      tnetd73xx_gpio_out(param,FALSE);
++      spin_unlock_irqrestore(&device_lock, flags);
++}
++
++static void gpio_led_off ( unsigned long param )
++{
++      unsigned int flags = 0x00;
++
++      spin_lock_irqsave(&device_lock, flags);
++
++      tnetd73xx_gpio_out(param,TRUE);
++      spin_unlock_irqrestore(&device_lock, flags);
++}
++
++static void gpio_led_init( unsigned long param)
++{
++      tnetd73xx_gpio_ctrl(param,GPIO_PIN,GPIO_OUTPUT_PIN);
++}
++
++static void board_gpio_reset(void)
++{
++      /* Initialize the link mask */
++      device_lock = SPIN_LOCK_UNLOCKED;
++      return;
++}
++
++#if defined CONFIG_AR7WRD || defined CONFIG_AR7RD
++
++static ssize_t proc_read_hwversion_fops(struct file *filp, char *buf, 
++                                      size_t count, loff_t *offp)
++{
++      char line[8];
++      int len = 0;
++      if( *offp != 0 )
++              return 0;
++
++      len = sprintf(line,  "%d%d.%d%d%d%d\n", tnetd73xx_gpio_in(20),
++                      tnetd73xx_gpio_in(21), tnetd73xx_gpio_in(22),
++                      tnetd73xx_gpio_in(23), tnetd73xx_gpio_in(24),
++                      tnetd73xx_gpio_in(25));
++      
++      copy_to_user(buf, line, len);
++      *offp = len;
++      return len;
++}     
++
++static ssize_t proc_read_reset_fops(struct file *filp,
++                                 char *buf,size_t count , loff_t *offp)
++{
++  char * pdata = NULL;
++  char line[3];
++  int len = 0;
++  if( *offp != 0 )
++      return 0;
++
++  pdata = buf;
++      len = sprintf(line,"%d\n", res_state );
++//wwzh
++//  res_state = 0;
++  copy_to_user(buf,line,len );
++      *offp = len;
++      return len;
++}
++
++static void reset_timer_func(unsigned long data)
++{
++//wwzh
++#if 0
++      count = (tnetd73xx_gpio_in(AR7_RESET_GPIO) == 0) ? count + 1: 0;
++        if( count >= RESET_HOLD_TIME/RESET_POLL_TIME )
++#endif
++      if (tnetd73xx_gpio_in(AR7_RESET_GPIO) == 0)
++              res_state = 1;
++      else
++              res_state = 0;
++      pTimer->expires = jiffies + HZ*RESET_POLL_TIME;
++      add_timer (pTimer);
++  return;
++}
++
++static void hardware_version_init(void)
++{
++      static struct proc_dir_entry *hardware_version_file;
++      hardware_version_file = create_proc_entry(AR7_VERSION_FILE, 0777, NULL);
++      if(hardware_version_file == NULL)
++               return;
++      
++      hardware_version_file->owner = THIS_MODULE;
++      hardware_version_file->proc_fops = &hardware_version_fops;
++
++      tnetd73xx_gpio_ctrl(20,GPIO_PIN,GPIO_INPUT_PIN);
++      tnetd73xx_gpio_ctrl(21,GPIO_PIN,GPIO_INPUT_PIN);
++      tnetd73xx_gpio_ctrl(22,GPIO_PIN,GPIO_INPUT_PIN);
++      tnetd73xx_gpio_ctrl(23,GPIO_PIN,GPIO_INPUT_PIN);
++      tnetd73xx_gpio_ctrl(24,GPIO_PIN,GPIO_INPUT_PIN);
++      tnetd73xx_gpio_ctrl(25,GPIO_PIN,GPIO_INPUT_PIN);
++      
++      return;
++}
++
++static void reset_init(void)
++{
++  /* Create board reset proc file */
++  reset_file = create_proc_entry( AR7_RESET_FILE, 0777, NULL);
++  if( reset_file == NULL)
++    goto reset_file;
++  reset_file->owner = THIS_MODULE;
++  reset_file->proc_fops = &reset_fops;
++
++  /* Initialise GPIO 11 for input */
++  tnetd73xx_gpio_ctrl(AR7_RESET_GPIO,GPIO_PIN,GPIO_INPUT_PIN);
++
++  /* Create a timer which fires every seconds */
++  pTimer = kmalloc(sizeof(struct timer_list),GFP_KERNEL);
++      init_timer( pTimer );
++      pTimer->function = reset_timer_func;
++      pTimer->data = 0;
++  /* Start the timer */
++  reset_timer_func(0);
++  return ;
++
++  reset_file:
++    remove_proc_entry("AR7_RESET_FILE",NULL);
++      return;
++}
++#endif
++/*************wwzh****************/
++#if 1
++extern unsigned int sys_mod_state;
++extern unsigned int  wan_mod_state;
++extern unsigned int wlan_mod_state;
++void sys_led_init(void)
++{
++      tnetd73xx_gpio_ctrl(4, GPIO_PIN, GPIO_OUTPUT_PIN);
++      tnetd73xx_gpio_ctrl(5, GPIO_PIN, GPIO_OUTPUT_PIN);
++      tnetd73xx_gpio_ctrl(8, GPIO_PIN, GPIO_OUTPUT_PIN);
++
++      tnetd73xx_gpio_out(4, FALSE);
++      tnetd73xx_gpio_out(5, TRUE);
++      tnetd73xx_gpio_out(8, TRUE);
++      
++
++      sys_mod_state = 2;
++
++}
++void wan_led_init(void)
++{
++      
++      tnetd73xx_gpio_ctrl(2, GPIO_PIN, GPIO_OUTPUT_PIN);
++      tnetd73xx_gpio_ctrl(3, GPIO_PIN, GPIO_OUTPUT_PIN);
++      
++      tnetd73xx_gpio_out(2, FALSE);
++      tnetd73xx_gpio_out(3, FALSE);
++
++      wan_mod_state = 1;
++}
++//wwzh wireless
++#if 0
++void wlan_led_init(void)
++{
++      //unsigned long i = 0;  
++      tnetd73xx_gpio_ctrl(12, GPIO_PIN, GPIO_OUTPUT_PIN);
++      tnetd73xx_gpio_ctrl(13, GPIO_PIN, GPIO_OUTPUT_PIN);
++      
++      tnetd73xx_gpio_out(12, FALSE);
++      tnetd73xx_gpio_out(13, TRUE);
++      //for (i = 0; i < 0x20000000; i++);
++      wlan_mod_state = 1;
++}
++#endif
++
++#endif
++/*************end ****************/
++
++void board_gpio_init(void)
++{
++
++      board_gpio_reset();
++/**************wwzh*************/
++      sys_led_init();
++      wan_led_init();
++
++      //junzhao 2004.3.15
++      hardware_version_init();
++      
++      //wlan_led_init();
++
++      /* Register Device MAX_LED_ID + 1 for reset to factory default */
++       temp[0].param = 0;
++       temp[0].init = reset_init;
++       temp[0].onfunc = 0;
++       temp[0].offfunc = 0;
++       register_led_drv( MAX_LED_ID + 1 , &temp[0]);
++//wwzh for wireless led  
++#if 1
++  /* Register led 12 WiFi 6 */
++  temp[1].param = 6;
++  temp[1].init = gpio_led_init;
++  temp[1].onfunc = gpio_led_on;
++  temp[1].offfunc = gpio_led_off;
++  register_led_drv( 12 , &temp[1]);
++
++#endif
++
++#if 0
++/**************end ************/
++#if defined(CONFIG_AR5D01)
++  /* Register led 1 GPIO0 */
++  temp[0].param = GPIO_0;
++  temp[0].init = gpio_led_init;
++  temp[0].onfunc = gpio_led_on;
++  temp[0].offfunc = gpio_led_off;
++      register_led_drv( 1 , &temp[0]);
++
++  /* Register led 2 EINT1 */
++  temp[1].param = EINT_1;
++  temp[1].init = gpio_led_init;
++  temp[1].onfunc = gpio_led_on;
++  temp[1].offfunc = gpio_led_off;
++      register_led_drv( 2 , &temp[1]);
++
++  /* Register led 5 EINT1 */
++  temp[2].param = GPIO_1;
++  temp[2].init = gpio_led_init;
++  temp[2].onfunc = gpio_led_on;
++  temp[2].offfunc = gpio_led_off;
++      register_led_drv( 5 , &temp[2]);
++#endif
++
++#if defined(CONFIG_AR5W01)
++  /* Register led 5 GPIO_1 */
++  temp[0].param = GPIO_1;
++  temp[0].init = gpio_led_init;
++  temp[0].onfunc = gpio_led_on;
++  temp[0].offfunc = gpio_led_off;
++      register_led_drv( 5 , &temp[0]);
++
++  /* Register led 7 GPIO_0 */
++  temp[1].param = GPIO_0;
++  temp[1].init = gpio_led_init;
++  temp[1].onfunc = gpio_led_on;
++  temp[1].offfunc = gpio_led_off;
++      register_led_drv( 7 , &temp[1]);
++#endif
++
++//wwzh #if defined(CONFIG_AR7RD)
++#if defined CONFIG_AR7WRD || defined CONFIG_AR7RD
++  /* Register led 5 Green PPPOE GPIO 13 */
++  temp[0].param = 13;
++  temp[0].init = gpio_led_init;
++  temp[0].onfunc = gpio_led_on;
++  temp[0].offfunc = gpio_led_off;
++      register_led_drv( 5 , &temp[0]);
++
++  /* Register led 7 Green USB GPIO 12 */
++  temp[1].param = 12;
++  temp[1].init = gpio_led_init;
++  temp[1].onfunc = gpio_led_on;
++  temp[1].offfunc = gpio_led_off;
++      register_led_drv( 7 , &temp[1]);
++
++  /* Register Device MAX_LED_ID + 1 for reset to factory default */
++  temp[2].param = 0;
++  temp[2].init = reset_init;
++  temp[2].onfunc = 0;
++  temp[2].offfunc = 0;
++      register_led_drv( MAX_LED_ID + 1 , &temp[2]);
++
++  /* Register led 8 RED DSL GPIO 10 */
++  temp[3].param = 10;
++  temp[3].init = gpio_led_init;
++  temp[3].onfunc = gpio_led_on;
++  temp[3].offfunc = gpio_led_off;
++      register_led_drv( 8 , &temp[3]);
++
++  /* Register led 9 RED PPPoE down GPIO 9 */
++  temp[4].param = 9;
++  temp[4].init = gpio_led_init;
++  temp[4].onfunc = gpio_led_on;
++  temp[4].offfunc = gpio_led_off;
++      register_led_drv( 9 , &temp[4]);
++
++  /* Register led 10 DSL down GPIO 8 */
++  temp[5].param = 8;
++  temp[5].init = gpio_led_init;
++  temp[5].onfunc = gpio_led_on;
++  temp[5].offfunc = gpio_led_off;
++      register_led_drv( 10 , &temp[5]);
++
++  /* Register led 11 Power GPIO 7 */
++  temp[6].param = 7;
++  temp[6].init = gpio_led_init;
++  temp[6].onfunc = gpio_led_on;
++  temp[6].offfunc = gpio_led_off;
++      register_led_drv( 11 , &temp[6]);
++
++  /* Register led 12 WiFi 6 */
++  temp[7].param = 6;
++  temp[7].init = gpio_led_init;
++  temp[7].onfunc = gpio_led_on;
++  temp[7].offfunc = gpio_led_off;
++      register_led_drv( 12 , &temp[7]);
++
++  /* Register led 13 ELINK(AA1313) GPIO 15 */
++  temp[8].param = 15;
++  temp[8].init = gpio_led_init;
++  temp[8].onfunc = gpio_led_on;
++  temp[8].offfunc = gpio_led_off;
++      register_led_drv( 13 , &temp[8]);
++
++  /* Register led 14 EACT(Y13) GPIO 16 */
++  temp[9].param = 16;
++  temp[9].init = gpio_led_init;
++  temp[9].onfunc = gpio_led_on;
++  temp[9].offfunc = gpio_led_off;
++      register_led_drv( 14 , &temp[9]);
++
++#endif
++/**************wwzh**************/
++#endif
++/**************end **************/
++  return;
++}
++
++
++
++
++
++
++
++

 diff -urN linux.old/drivers/char/avalanche_led/ledmod.c linux.dev/drivers/char/avalanche_led/ledmod.c
 --- linux.old/drivers/char/avalanche_led/ledmod.c      1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/drivers/char/avalanche_led/ledmod.c linux.dev/drivers/char/avalanche_led/ledmod.c
 --- linux.old/drivers/char/avalanche_led/ledmod.c      1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/char/avalanche_led/ledmod.c      2005-07-11 03:16:48.247012224 +0200
-@@ -0,0 +1,719 @@
++++ linux.dev/drivers/char/avalanche_led/ledmod.c      2005-07-12 03:12:40.675888720 +0200
+@@ -0,0 +1,1116 @@

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


@@ -23,224 +409,189 @@ diff -urN linux.old/drivers/char/avalanche_led/ledmod.c linux.dev/drivers/char/a
 +#define LED_BLINK_UP                  5
 +#define LED_BLINK_DOWN        6
 +
 +#define LED_BLINK_UP                  5
 +#define LED_BLINK_DOWN        6
 +

-+typedef struct state_entry {
-+      unsigned char mode;
-+      unsigned char led;
-+      void (*handler) (struct state_entry * pState);
-+      unsigned long param;
-+} state_entry_t;
++extern void avalanche_leds_init(void);
++
++/***********wwzh**************/
++unsigned int sys_mod_state;
++unsigned int wan_mod_state;
++unsigned int wlan_mod_state;

 +
 +

-+typedef struct mod_entry {
-+      state_entry_t *states[MAX_STATE_ID];
-+} mod_entry_t;
++struct timer_list *pWanTimer = NULL;
++struct timer_list *pWlanTimer = NULL;
++/***********end **************/
++
++typedef struct state_entry{
++  unsigned char mode;
++  unsigned char led;
++      void (*handler)(struct state_entry *pState);
++  unsigned long param;
++}state_entry_t;
++
++typedef struct mod_entry{
++  state_entry_t *states[MAX_STATE_ID];
++}mod_entry_t;

 +
 +static mod_entry_t *modArr[MAX_MOD_ID];
 +
 +static mod_entry_t *modArr[MAX_MOD_ID];

-+static struct proc_dir_entry *led_proc_dir, *led_file;
++static struct proc_dir_entry *led_proc_dir,*led_file;

 +
 +/* index of the array is the led number HARDWARE SPECIFIC*/
 +
 +/* index of the array is the led number HARDWARE SPECIFIC*/

-+typedef struct led_data {
++typedef struct led_data{

 +      led_reg_t *led;
 +      led_reg_t *led;

-+      int state;
++  int                         state;

 +      struct timer_list *pTimer;
 +      unsigned char timer_running;
 +      struct timer_list *pTimer;
 +      unsigned char timer_running;

-+      unsigned long param;
-+} led_data_t;
++  unsigned long param;
++}led_data_t;

 +
 +led_data_t led_arr[MAX_LED_ID + 1];
 +/*!!! The last device is actually being used for ar7 reset to factory default */
 +
 +led_data_t led_arr[MAX_LED_ID + 1];
 +/*!!! The last device is actually being used for ar7 reset to factory default */

-+#if 1
-+/* Ron add for adsl LED blink */
-+#define GPIO_ADSL_ACT  (1<<6)
-+#define GPIO_ADSL_DOWN (1<<8)
-+#define BLINK_FAST     5*HZ/100
-+#define BLINK_SLOW     15*HZ/100
-+static struct timer_list my_led_timer;
-+static int my_blink_count = 0;
-+static int my_mode = 1;
-+void led_operation(int mod, int state);
-+
-+static void my_led_on(unsigned long gpio, int logic)
-+{
-+      if (logic > 0)
-+              GPIO_DATA_OUTPUT |= gpio;
-+      else
-+              GPIO_DATA_OUTPUT &= ~gpio;
-+
-+}
-+static void my_led_off(unsigned long gpio, int logic)
-+{
-+      if (logic > 0)
-+              GPIO_DATA_OUTPUT &= ~gpio;
-+      else
-+              GPIO_DATA_OUTPUT |= gpio;
-+
-+}

 +
 +

-+static void my_led_init(unsigned long gpio, int init, int logic)
-+{
-+      GPIO_DATA_ENABLE |= gpio;
-+      GPIO_DATA_DIR &= ~gpio;
-+      if (init)
-+              my_led_on(gpio, logic);
-+      else
-+              my_led_off(gpio, logic);
-+}

 +
 +

-+static void my_led_blink_timer(unsigned long data)
-+{
-+      unsigned long gpio = GPIO_ADSL_ACT;
-+      unsigned int speed = BLINK_FAST;
-+      if (my_mode == 2) {
-+              gpio = GPIO_ADSL_DOWN;
-+              speed = BLINK_SLOW;
-+      }
-+      if (my_blink_count) {
-+              if (GPIO_DATA_OUTPUT & gpio) {
-+                      GPIO_DATA_OUTPUT &= ~gpio;
-+                      if (my_mode != 2)
-+                              my_blink_count = 0;
-+              } else {
-+                      GPIO_DATA_OUTPUT |= gpio;
-+              }
-+      }
-+      my_led_timer.expires = jiffies + speed;
-+      add_timer(&my_led_timer);
-+}
-+
-+/* Ron add for ADSL led blink */
-+#endif
-+static spinlock_t config_lock;
++static spinlock_t     config_lock;

 +
 +

-+static void board_led_link_up(state_entry_t * pState);
-+static void board_led_link_down(state_entry_t * pState);
-+static void board_led_activity_on(state_entry_t * pState);
-+static void board_led_activity_off(state_entry_t * pState);
++static void board_led_link_up( state_entry_t *pState );
++static void board_led_link_down( state_entry_t *pState );
++static void board_led_activity_on( state_entry_t *pState );
++static void board_led_activity_off( state_entry_t *pState );

 +static void led_timer_func(unsigned long data);
 +
 +static void led_timer_func(unsigned long data);
 +

-+static ssize_t proc_read_led_fops(struct file *filp, char *buf, size_t count, loff_t * offp);
-+static ssize_t proc_write_led_fops(struct file *filp, const char *buffer, size_t count, loff_t * offp);
-+static int config_led(unsigned long y);
++extern void board_gpio_init(void);
++extern void uart_led_init(void);
++
++static ssize_t proc_read_led_fops(struct file *filp,
++                                 char *buf,size_t count , loff_t *offp);
++static ssize_t proc_write_led_fops(struct file *filp,const char *buffer,
++                                                      size_t count , loff_t *offp);
++static int config_led( unsigned long y);

 +
 +struct file_operations led_fops = {
 +
 +struct file_operations led_fops = {

-+  read:proc_read_led_fops,
-+  write:proc_write_led_fops,
-+};
++                                     read: proc_read_led_fops,
++                                     write: proc_write_led_fops,
++                                   };

 +
 +

-+static int led_atoi(char *name)
++static int led_atoi( char *name)

 +{
 +      int val = 0;
 +{
 +      int val = 0;

-+      for (;; name++) {
-+              switch (*name) {
-+              case '0'...'9':
-+                      val = val * 10 + (*name - '0');
-+                      break;
-+              default:
-+                      return val;
++  for(;;name++)
++      {
++              switch(*name)
++              {
++                      case '0'...'9':
++                              val = val*10+(*name - '0');
++                              break;
++                      default:
++                              return val;

 +              }
 +      }
 +}
 +
 +static int free_memory(void)
 +{
 +              }
 +      }
 +}
 +
 +static int free_memory(void)
 +{

-+      int i, j;
-+
-+      for (i = 0; i < MAX_MOD_ID; i++) {
-+              if (modArr[i] != NULL) {
-+                      for (j = 0; j < MAX_STATE_ID; j++) {
-+                              if (modArr[i]->states[j] != NULL)
-+                                      kfree(modArr[i]->states[j]);
++  int i, j;
++
++  for( i = 0; i < MAX_MOD_ID ; i++)
++      {
++              if( modArr[i] != NULL )
++              {
++                      for( j = 0; j < MAX_STATE_ID ; j++ )
++                      {
++                              if( modArr[i]->states[j] != NULL )
++                                      kfree( modArr[i]->states[j]);

 +                      }
 +                      kfree(modArr[i]);
 +                      }
 +                      kfree(modArr[i]);

-+                      modArr[i] = NULL;
++      modArr[i] = NULL;

 +              }
 +      }
 +              }
 +      }

-+      return 0;
++  return 0;

 +}
 +
 +}
 +

-+static int led_on(state_entry_t * pState)
++static int led_on( state_entry_t *pState )

 +{
 +{

-+      if (led_arr[pState->led].led == NULL)
++      if( led_arr[pState->led].led == NULL)

 +              return -1;
 +              return -1;

-+      led_arr[pState->led].led->onfunc(led_arr[pState->led].led->param);
-+      return 0;
++  led_arr[pState->led].led->onfunc( led_arr[pState->led].led->param);
++  return 0;

 +}
 +
 +}
 +

-+static int led_off(state_entry_t * pState)
++static int led_off( state_entry_t *pState )

 +{
 +{

-+      if (led_arr[pState->led].led == NULL)
++      if( led_arr[pState->led].led == NULL)

 +              return -1;
 +              return -1;

-+      led_arr[pState->led].led->offfunc(led_arr[pState->led].led->param);
-+      return 0;
++  led_arr[pState->led].led->offfunc( led_arr[pState->led].led->param);
++  return 0;

 +}
 +
 +}
 +

-+static void board_led_link_up(state_entry_t * pState)
++static void board_led_link_up( state_entry_t *pState )

 +{
 +{

-+      led_arr[pState->led].state = LED_ON;
-+      if (led_arr[pState->led].timer_running == 0)
-+              led_on(pState);
-+      return;
++  led_arr[pState->led].state = LED_ON;
++  if( led_arr[pState->led].timer_running == 0 )
++      led_on(pState);
++  return;

 +}
 +
 +}
 +

-+static void board_led_link_down(state_entry_t * pState)
++static void board_led_link_down( state_entry_t *pState )

 +{
 +      led_arr[pState->led].state = LED_OFF;
 +{
 +      led_arr[pState->led].state = LED_OFF;

-+      if (led_arr[pState->led].timer_running == 0)
-+              led_off(pState);
-+      return;
++  if( led_arr[pState->led].timer_running == 0 )
++      led_off(pState);
++  return;

 +}
 +
 +}
 +

-+static void add_led_timer(state_entry_t * pState)
++static void add_led_timer(state_entry_t *pState)

 +{
 +{

-+      led_arr[pState->led].pTimer->expires =
-+              jiffies + HZ * (pState->param) / 1000;
-+      led_arr[pState->led].param = pState->param;
-+      led_arr[pState->led].pTimer->data = pState;
-+      add_timer(led_arr[pState->led].pTimer);
++      led_arr[pState->led].pTimer->expires = jiffies + HZ*(pState->param)/1000;
++  led_arr[pState->led].param = pState->param;
++  led_arr[pState->led].pTimer->data = pState;
++      add_timer (led_arr[pState->led].pTimer);

 +}
 +
 +}
 +

-+static void board_led_activity_on(state_entry_t * pState)
++static void board_led_activity_on(state_entry_t *pState)

 +{
 +{

-+      if (led_arr[pState->led].timer_running == 0) {
++  if(led_arr[pState->led].timer_running == 0)
++      {

 +              led_on(pState);
 +              add_led_timer(pState);
 +              led_on(pState);
 +              add_led_timer(pState);

-+              led_arr[pState->led].timer_running = 1;
-+              led_arr[pState->led].state = LED_BLINK_UP;
-+      } else if (led_arr[pState->led].timer_running > 0xF0) {
-+              led_arr[pState->led].state = LED_BLINK_UP;
-+              led_arr[pState->led].pTimer->expires =
-+                      jiffies + HZ * (pState->param) / 1000;
-+              led_arr[pState->led].param = pState->param;
-+              led_arr[pState->led].pTimer->data = pState;
++        led_arr[pState->led].timer_running = 1;
++        led_arr[pState->led].state = LED_BLINK_UP;
++      }
++      else if( led_arr[pState->led].timer_running > 0xF0)
++      {
++        led_arr[pState->led].state = LED_BLINK_UP;
++              led_arr[pState->led].pTimer->expires = jiffies + HZ*(pState->param)/1000;
++      led_arr[pState->led].param = pState->param;
++      led_arr[pState->led].pTimer->data = pState;

 +      }
 +      return;
 +}
 +
 +      }
 +      return;
 +}
 +

-+static void board_led_activity_off(state_entry_t * pState)
++static void board_led_activity_off(state_entry_t *pState)

 +{
 +{

-+      if (led_arr[pState->led].timer_running == 0) {
++  if(led_arr[pState->led].timer_running == 0)
++      {

 +              led_off(pState);
 +              add_led_timer(pState);
 +              led_off(pState);
 +              add_led_timer(pState);

-+              led_arr[pState->led].timer_running = 1;
-+              led_arr[pState->led].state = LED_BLINK_UP;
-+      } else if (led_arr[pState->led].timer_running > 0xF0) {
-+              led_arr[pState->led].state = LED_BLINK_UP;
-+              led_arr[pState->led].pTimer->expires =
-+                      jiffies + HZ * (pState->param) / 1000;
-+              led_arr[pState->led].param = pState->param;
-+              led_arr[pState->led].pTimer->data = pState;
++        led_arr[pState->led].timer_running = 1;
++        led_arr[pState->led].state = LED_BLINK_UP;
++      }
++      else if( led_arr[pState->led].timer_running > 0xF0)
++      {
++        led_arr[pState->led].state = LED_BLINK_UP;
++              led_arr[pState->led].pTimer->expires = jiffies + HZ*(pState->param)/1000;
++      led_arr[pState->led].param = pState->param;
++      led_arr[pState->led].pTimer->data = pState;

 +      }
 +      return;
 +}
 +
 +      }
 +      return;
 +}
 +

-+static void board_led_link_flash(state_entry_t * pState)
++static void board_led_link_flash(state_entry_t *pState)

 +{
 +{

-+      if (led_on(pState))
++  if(led_on(pState))

 +              return;
 +              return;

-+      if (led_arr[pState->led].timer_running == 0)
++  if(led_arr[pState->led].timer_running == 0)

 +              add_led_timer(pState);
 +      else
 +              add_led_timer(pState);
 +      else

-+              led_arr[pState->led].param = pState->param;
-+      led_arr[pState->led].timer_running = 0xFF;
++    led_arr[pState->led].param = pState->param;
++  led_arr[pState->led].timer_running = 0xFF;

 +      led_arr[pState->led].state = LED_FLASH;
 +      return;
 +}
 +      led_arr[pState->led].state = LED_FLASH;
 +      return;
 +}


@@ -248,157 +599,641 @@ diff -urN linux.old/drivers/char/avalanche_led/ledmod.c linux.dev/drivers/char/a
 +static void led_timer_func(unsigned long data)
 +{
 +      state_entry_t *pState = NULL;
 +static void led_timer_func(unsigned long data)
 +{
 +      state_entry_t *pState = NULL;

-+      mod_entry_t *pMod = NULL;
++  mod_entry_t *pMod = NULL;

 +      unsigned int flags;
 +
 +      spin_lock_irqsave(&config_lock, flags);
 +
 +      unsigned int flags;
 +
 +      spin_lock_irqsave(&config_lock, flags);
 +

-+      pState = (state_entry_t *) data;
++  pState = (state_entry_t *)data;

 +
 +

-+      if (led_arr[pState->led].state == LED_BLINK_DOWN) {
++  if( led_arr[pState->led].state == LED_BLINK_DOWN )
++      {

 +              led_arr[pState->led].timer_running = 0;
 +              led_arr[pState->led].timer_running = 0;

-+              if (pState->mode == 2)
++              if( pState->mode == 2 )

 +                      led_arr[pState->led].state = LED_OFF;
 +              else
 +                      led_arr[pState->led].state = LED_ON;
 +                      led_arr[pState->led].state = LED_OFF;
 +              else
 +                      led_arr[pState->led].state = LED_ON;

-+      } else if (led_arr[pState->led].state == LED_BLINK_UP) {
-+              led_arr[pState->led].pTimer->expires =
-+                      jiffies + HZ * (led_arr[pState->led].param) / 1000;
-+              led_arr[pState->led].pTimer->data = pState;
-+              add_timer(led_arr[pState->led].pTimer);
-+              if (pState->mode == 2) {
-+                      led_off(pState);
++      }
++  else if( led_arr[pState->led].state == LED_BLINK_UP )
++      {
++    led_arr[pState->led].pTimer->expires = jiffies + HZ*(led_arr[pState->led].param)/1000;
++      led_arr[pState->led].pTimer->data = pState;
++              add_timer (led_arr[pState->led].pTimer);
++              if( pState->mode == 2 )
++              {
++              led_off(pState);

 +                      led_arr[pState->led].state = LED_BLINK_DOWN;
 +                      led_arr[pState->led].state = LED_BLINK_DOWN;

-+              } else {
-+                      led_on(pState);
++              }
++              else
++              {
++              led_on(pState);

 +                      led_arr[pState->led].state = LED_BLINK_DOWN;
 +              }
 +              led_arr[pState->led].timer_running = 1;
 +                      led_arr[pState->led].state = LED_BLINK_DOWN;
 +              }
 +              led_arr[pState->led].timer_running = 1;

-+      } else if (led_arr[pState->led].state == LED_FLASH) {
-+              led_arr[pState->led].pTimer->expires =
-+                      jiffies + HZ * (led_arr[pState->led].param) / 1000;
-+              led_arr[pState->led].pTimer->data = pState;
-+              add_timer(led_arr[pState->led].pTimer);
-+
-+              if (led_arr[pState->led].timer_running == 0xFF) {
-+                      led_off(pState);
++      }
++  else if( led_arr[pState->led].state == LED_FLASH )
++      {
++    led_arr[pState->led].pTimer->expires = jiffies + HZ*(led_arr[pState->led].param)/1000;
++      led_arr[pState->led].pTimer->data = pState;
++              add_timer (led_arr[pState->led].pTimer);
++
++              if( led_arr[pState->led].timer_running == 0xFF )
++              {
++              led_off(pState);

 +                      led_arr[pState->led].timer_running--;
 +                      led_arr[pState->led].timer_running--;

-+              } else {
-+                      led_on(pState);
++              }
++              else
++              {
++              led_on(pState);

 +                      led_arr[pState->led].timer_running++;
 +              }
 +              spin_unlock_irqrestore(&config_lock, flags);
 +                      led_arr[pState->led].timer_running++;
 +              }
 +              spin_unlock_irqrestore(&config_lock, flags);

++    return;
++      }
++  else if(led_arr[pState->led].state == LED_OFF)
++      {
++      led_off(pState);
++    led_arr[pState->led].timer_running = 0;
++      }
++      else if( led_arr[pState->led].state == LED_ON )
++      {
++      led_on(pState);
++    led_arr[pState->led].timer_running = 0;
++      }
++      spin_unlock_irqrestore(&config_lock, flags);
++  return;
++}
++/************wwzh*****************/
++#if 0
++/************end *****************/
++static ssize_t proc_read_led_fops(struct file *filp,
++                                 char *buf,size_t count , loff_t *offp)
++{
++  char * pdata = NULL;
++  int i = 0, j = 0, len = 0, totallen = 0;
++  char line[255];
++
++  if( *offp != 0 )
++      return 0;
++
++  pdata = buf;
++  len += sprintf(line,"LEDS Registered for use are:");
++  for( i = 0; i< MAX_LED_ID; i++)
++              if( led_arr[i].led != NULL )
++                      len += sprintf(&line[len]," %d ", i );
++  line[len++] = '\n';
++
++  copy_to_user(pdata, line,len );
++  pdata += len;
++  totallen += len;
++  len = 0;
++  len = sprintf(line,"USER MODULE INFORMATION:\n");
++  copy_to_user(pdata, line,len );
++  pdata += len;
++  totallen += len;
++  len = 0;
++  for( i = 0; i< MAX_MOD_ID; i++)
++      {
++              if( modArr[i] != NULL )
++              {
++                      len = sprintf(line,"  Module ID = %d \n" , i);
++              copy_to_user(pdata, line,len );
++      pdata += len;
++              totallen += len;
++              len = 0;
++                      for( j = 0; j < MAX_STATE_ID; j++)
++                      {
++                              if( modArr[i]->states[j] != NULL)
++                              {
++                                      len = sprintf(line ,
++                              "    State = %d , Led = %d," , j , modArr[i]->states[j]->led);
++                              copy_to_user(pdata, line,len );
++          pdata += len;
++                              totallen += len;
++
++                              len = 0;
++          switch( modArr[i]->states[j]->mode )
++                                      {
++                                              case 1:
++                                                                      len = sprintf(line ," Mode = OFF\n");
++                                                                      break;
++                                              case 2:
++                                                                      len = sprintf(line ," Mode = BLINK_ON , On Time(ms) = %d\n" ,
++                                       (unsigned int)modArr[i]->states[j]->param);
++                                                                      break;
++                                              case 3:
++                                                                      len = sprintf(line ," Mode = BLINK_OFF , Off Time(ms) = %d\n" ,
++                                       (unsigned int)modArr[i]->states[j]->param);
++                                                                      break;
++                                              case 4:
++                                                                      len = sprintf(line ," Mode = ON \n");
++                                                                      break;
++                                              case 5:
++                                                                      len = sprintf(line ," Mode = FLASH , Time Period(ms) = %d\n" ,
++                                       (unsigned int)modArr[i]->states[j]->param);
++                                                                      break;
++                                              default:
++                                                      break;
++
++                                      }
++                              copy_to_user(pdata, line,len );
++          pdata += len;
++                              totallen += len;
++
++                              len = 0;
++                              }
++                      }
++              }
++      }
++  /* Return with configuration information for LEDs */
++      *offp = totallen;
++      return totallen;
++}
++static ssize_t proc_write_led_fops(struct file *filp,const char *buffer,
++                                                      size_t count , loff_t *offp)
++{
++  char *pdata = NULL, *ptemp = NULL;
++  char line[10],temp[10];
++  int i = 0;
++  int mod = 0xFFFF , state = 0xFFFF;
++  int flag = 0;
++
++  /* Check if this write is for configuring stuff */
++  if( *(int *)(buffer) == 0xFFEEDDCC )
++      {
++    printk("<1>proc write:Calling Configuration\n");
++              config_led((unsigned long)(buffer + sizeof(int)) );
++              return count;
++      }
++
++  if( count >= 10)
++      {
++    printk("<1>proc write:Input too long,max length = %d\n",10);
++    return count;
++      }
++  memset( temp, 0x00 , 10);
++  memset( line, 0x00 , 10);
++  copy_from_user(line,buffer,count);
++  line[count] = 0x00;
++  pdata = line;
++  ptemp = temp;
++  while( flag == 0)
++  {
++              if( i > 10 )
++                      break;
++              if( ((*pdata) >= '0' ) && ((*pdata) <= '9') )
++              {       
++                      *ptemp = *pdata ;
++                      ptemp++;
++              }       
++              else if( (*pdata) == ',' )
++              {
++      *ptemp = 0x00;
++                      flag = 1;
++              }       
++              pdata++;
++              i++;
++  };
++      if( flag == 1)
++      mod = led_atoi( temp);
++      else
++              return count;
++              
++  ptemp = temp;
++  *ptemp = 0x00;
++  flag = 0;
++  while( flag == 0)
++  {
++              if( i > 10 )
++                      break;
++              if( ((*pdata) >= '0' ) && ((*pdata) <= '9') )
++              {       
++                      *ptemp = *pdata ;
++                      ptemp++;
++              }       
++              else if( (*pdata) == 0x00 )
++              {
++      *ptemp = 0x00;
++                      flag = 1;
++              }       
++              pdata++;
++    i++;
++  };
++      if( flag == 1)
++      state = led_atoi( temp);
++      else
++              return count;
++  if( (mod == 0xFFFF) || (state == 0xFFFF))
++              return count;
++  else
++    led_operation( mod , state );
++  return count;
++}
++
++/************wwzh*******************/
++#else
++
++#define TRUE 1
++#define FALSE 0
++#define FLICK_TIME (HZ*100/1000)
++static unsigned int wan_txrx_state = 0;
++static unsigned int wlan_txrx_state = 0;
++
++void led_operation( int mod , int state)
++{
++
++      unsigned int flags;
++
++      spin_lock_irqsave(&config_lock, flags);
++
++      if( (mod >= MAX_MOD_ID) || ( state >= MAX_STATE_ID) )
++      {
++        spin_unlock_irqrestore(&config_lock, flags);
++              return;
++      }
++      if ( modArr[mod] == NULL )
++      {
++        spin_unlock_irqrestore(&config_lock, flags);
++              return;
++      }
++      if( modArr[mod]->states[state] == NULL )
++      {
++        spin_unlock_irqrestore(&config_lock, flags);

 +              return;
 +              return;

-+      } else if (led_arr[pState->led].state == LED_OFF) {
-+              led_off(pState);
-+              led_arr[pState->led].timer_running = 0;
-+      } else if (led_arr[pState->led].state == LED_ON) {
-+              led_on(pState);
-+              led_arr[pState->led].timer_running = 0;

 +      }
 +      }

++  /* Call the function handler  */
++  modArr[mod]->states[state]->handler(modArr[mod]->states[state]);
++

 +      spin_unlock_irqrestore(&config_lock, flags);
 +      spin_unlock_irqrestore(&config_lock, flags);

-+      return;

 +}
 +
 +}
 +

++static void wan_led_func(unsigned long data)
++{
++      if (wan_txrx_state == 0)
++      {
++              tnetd73xx_gpio_out(2, TRUE);
++              tnetd73xx_gpio_out(3, FALSE);
++              wan_txrx_state = 1;
++      }
++      else
++      {
++              tnetd73xx_gpio_out(2, FALSE);
++              tnetd73xx_gpio_out(3, FALSE);
++              wan_txrx_state = 0;
++      }
++      pWanTimer->expires = jiffies + FLICK_TIME;
++      add_timer(pWanTimer);
++}
++//wwzh for wireless
++#if 0
++static void wlan_led_func(unsigned long data)
++{
++      if (wlan_txrx_state == 0)
++      {
++              tnetd73xx_gpio_out(12, TRUE);
++              tnetd73xx_gpio_out(13, FALSE);
++              wlan_txrx_state = 1;
++      }
++      else
++      {
++              tnetd73xx_gpio_out(12, FALSE);
++              tnetd73xx_gpio_out(13, FALSE);
++              wlan_txrx_state = 0;
++              
++      }
++      pWlanTimer->expires = jiffies + FLICK_TIME;
++      add_timer(pWlanTimer);
++}
++#endif
++
++void led_active(int mod, int state)
++{
++      unsigned int flags = 0;
++
++//printk("mod = %d state = %d\n", mod, state);
++      spin_lock_irqsave(&config_lock, flags);
++      if ((mod >= 5) || (state >= 5))
++      {
++              spin_unlock_irqrestore(&config_lock, flags);
++              return;
++      }
++      
++      switch (mod)
++      {
++              case 2: /*system led */
++                      sys_mod_state = state;
++                      switch (state)
++                      {
++                              case 1: 
++                                      break;
++                              case 2:  /*sys led flashing green */
++                                      tnetd73xx_gpio_out(4, FALSE);
++                                      tnetd73xx_gpio_out(5, TRUE);
++                                      tnetd73xx_gpio_out(8, TRUE);
++                                      break;
++                              case 3: /*sys led solid green */
++                                      tnetd73xx_gpio_out(4, TRUE);
++                                      tnetd73xx_gpio_out(5, TRUE);
++                                      tnetd73xx_gpio_out(8, TRUE);
++                                      
++                                      break;
++                              case 4: /*sys fail red */
++                                      tnetd73xx_gpio_out(4, TRUE);
++                                      tnetd73xx_gpio_out(5, FALSE);
++                                      tnetd73xx_gpio_out(8, FALSE);
++                                      break;
++                              default:
++                                      break;
++                      }
++                      break;
++              case 3: /*wan led */
++                      wan_mod_state = state;
++                      switch (state)
++                      {
++                              case 1: /*no wan interface*/
++                                      if (pWanTimer)
++                                      {
++                                              del_timer(pWanTimer);
++                                              kfree(pWanTimer);
++                                              pWanTimer = NULL;
++                                      }
++                                      tnetd73xx_gpio_out(2, FALSE);
++                                      tnetd73xx_gpio_out(3, FALSE);
++                                      break;
++                              case 2: /*wan connected */
++                                      if (pWanTimer)
++                                      {
++                                              del_timer(pWanTimer);
++                                              kfree(pWanTimer);
++                                              pWanTimer = NULL;
++                                      }
++                                      tnetd73xx_gpio_out(2, TRUE);
++                                      tnetd73xx_gpio_out(3, FALSE);
++                                      break;
++                              case 3: /*rx/tx activity */
++                                      if (pWanTimer != NULL)
++                                              break;  
++                              
++                                      pWanTimer = kmalloc(sizeof(struct timer_list), GFP_KERNEL);
++                                      init_timer(pWanTimer);
++                                      
++                                      pWanTimer->function = wan_led_func;
++                                      pWanTimer->data = 0;
++                                      pWanTimer->expires = jiffies + FLICK_TIME;
++                                      tnetd73xx_gpio_out(2, FALSE);
++                                      tnetd73xx_gpio_out(3, FALSE);
++                                      wan_txrx_state = 0;
++                                      add_timer(pWanTimer);
++
++                                      break;
++                              case 4: /*no ipaddress */
++                                      if (pWanTimer)
++                                      {
++                                              del_timer(pWanTimer);
++                                              kfree(pWanTimer);
++                                              pWanTimer = NULL;
++                                      }
++                                      tnetd73xx_gpio_out(2, FALSE);
++                                      tnetd73xx_gpio_out(3, TRUE);
++                                      break;
++                              default:
++                                      if (pWanTimer)
++                                      {       
++                                              del_timer(pWanTimer);
++                                              kfree(pWanTimer);
++                                              pWanTimer = NULL;
++                                      }
++                                      break;
++                      }
++                      break;
++      //wwzh for wireless 
++      #if 0
++              case 4: /*wlan led */
++                      wlan_mod_state = state;
++                      switch (state)
++                      {
++                              case 1: /* wlan off */
++                                      if (pWlanTimer)
++                                      {
++                                              del_timer(pWlanTimer);
++                                              kfree(pWlanTimer);
++                                              pWlanTimer = NULL;
++                                      }
++                                      tnetd73xx_gpio_out(12, FALSE);
++                                      tnetd73xx_gpio_out(13, FALSE);
++                                      break;
++                              case 2: /* wlan ready */
++                                      if (pWlanTimer)
++                                      {
++                                              del_timer(pWlanTimer);
++                                              kfree(pWlanTimer);
++                                              pWlanTimer = NULL;
++                                      }
++                                      tnetd73xx_gpio_out(12, TRUE);
++                                      tnetd73xx_gpio_out(13, FALSE);
++                                      break;
++                              case 3: /* wlan rx/tx activity */
++                                      if (pWlanTimer != NULL)
++                                              break;
++                                      
++                                      pWlanTimer = kmalloc(sizeof(struct timer_list), GFP_KERNEL);
++                                      init_timer(pWlanTimer);
++                                      
++                                      pWlanTimer->function = wlan_led_func;
++                                      pWlanTimer->data = 0;
++                                      pWlanTimer->expires = jiffies + FLICK_TIME;
++                                      tnetd73xx_gpio_out(12, FALSE);
++                                      tnetd73xx_gpio_out(13, FALSE);
++                                      wlan_txrx_state = 0;
++                                      add_timer(pWlanTimer);
++                                      
++                                      break;
++                              default:
++                                      if (pWlanTimer)
++                                      {
++                                              del_timer(pWlanTimer);
++                                              kfree(pWlanTimer);
++                                              pWlanTimer = NULL;
++                                      }
++                                      
++                                      break;
++                      }
++                      break;
++      #endif //for wireless
++              default:
++                      break;
++      }
++      spin_unlock_irqrestore(&config_lock, flags);
++}

 +static ssize_t proc_read_led_fops(struct file *filp,
 +static ssize_t proc_read_led_fops(struct file *filp,

-+                                                                char *buf, size_t count, loff_t * offp)
++                                 char *buf,size_t count , loff_t *offp)

 +{
 +      char *pdata = NULL;
 +      int i = 0, j = 0, len = 0, totallen = 0;
 +      char line[255];
 +{
 +      char *pdata = NULL;
 +      int i = 0, j = 0, len = 0, totallen = 0;
 +      char line[255];

-+
++      

 +      if (*offp != 0)
 +              return 0;
 +      if (*offp != 0)
 +              return 0;

-+

 +      pdata = buf;
 +      pdata = buf;

-+      len += sprintf(line, "LEDS Registered for use are:");
-+      for (i = 0; i < MAX_LED_ID; i++)
-+              if (led_arr[i].led != NULL)
-+                      len += sprintf(&line[len], " %d ", i);
-+      line[len++] = '\n';
-+
-+      copy_to_user(pdata, line, len);
-+      pdata += len;
-+      totallen += len;
-+      len = 0;

 +      len = sprintf(line, "USER MODULE INFORMATION:\n");
 +      copy_to_user(pdata, line, len);
 +      pdata += len;
 +      totallen += len;
 +      len = 0;
 +      len = sprintf(line, "USER MODULE INFORMATION:\n");
 +      copy_to_user(pdata, line, len);
 +      pdata += len;
 +      totallen += len;
 +      len = 0;

-+      for (i = 0; i < MAX_MOD_ID; i++) {
-+              if (modArr[i] != NULL) {
-+                      len = sprintf(line, "  Module ID = %d \n", i);
++      
++      //*******add Module 1 , this Module is ADSL ********/
++      for (i = 0; i < MAX_MOD_ID; i++)
++      {
++              if (modArr[i] != NULL)
++              {
++                      len = sprintf(line, " Module ID = %d\n", i);

 +                      copy_to_user(pdata, line, len);
 +                      pdata += len;
 +                      totallen += len;
 +                      len = 0;
 +                      copy_to_user(pdata, line, len);
 +                      pdata += len;
 +                      totallen += len;
 +                      len = 0;

-+                      for (j = 0; j < MAX_STATE_ID; j++) {
-+                              if (modArr[i]->states[j] != NULL) {
-+                                      len = sprintf(line,       "    State = %d , Led = %d,", j,
-+                                                                modArr[i]->states[j]->led);
++                      for(j = 0; j < MAX_STATE_ID; j++)
++                      {
++                              if (modArr[i]->states[j] != NULL)
++                              {
++                                      len = sprintf(line, "State =%d, Led = %d,", j, modArr[i]->states[j]->led);

 +                                      copy_to_user(pdata, line, len);
 +                                      pdata += len;
 +                                      totallen += len;
 +                                      copy_to_user(pdata, line, len);
 +                                      pdata += len;
 +                                      totallen += len;

-+

 +                                      len = 0;
 +                                      len = 0;

-+                                      switch (modArr[i]->states[j]->mode) {
-+                                      case 1:
-+                                              len = sprintf(line,     " Mode = OFF\n");
-+                                              break;
-+                                      case 2:
-+                                              len = sprintf(line,     " Mode = BLINK_ON , On Time(ms) = %d\n",
-+                                                                      (unsigned int) modArr[i]->states[j]->
-+                                                                      param);
-+                                              break;
-+                                      case 3:
-+                                              len = sprintf(line,     " Mode = BLINK_OFF , Off Time(ms) = %d\n",
-+                                                                      (unsigned int) modArr[i]->states[j]->
-+                                                                      param);
-+                                              break;
-+                                      case 4:
-+                                              len = sprintf(line,     " Mode = ON \n");
-+                                              break;
-+                                      case 5:
-+                                              len = sprintf(line,     " Mode = FLASH , Time Period(ms) = %d\n",
-+                                                                      (unsigned int) modArr[i]->states[j]->
-+                                                                      param);
-+                                              break;
-+                                      default:
-+                                              break;
-+
++                                      switch(modArr[i]->states[j]->mode)
++                                      {
++                                        case 1:
++                                          len = sprintf(line, "Mode = OFF\n");
++                                          break;
++                                        case 2:
++                                          len = sprintf(line, "Mode = BLINK_ON, On Time(ms) = %d\n", (unsigned int)modArr[i]->states[j]->param);      
++                                          break;
++                                        case 3:
++                                          len = sprintf(line, "Mode = BLINK_OFF, Off Time(ms) = %d\n", (unsigned int)modArr[i]->states[j]->param);
++                                          break;
++                                        case 4:
++                                          len = sprintf(line, "Mode = On\n");
++                                          break;
++                                        case 5:
++                                          len = sprintf(line, "Mode = FLASH, Time Period(ms) = %d\n", (unsigned int)modArr[i]->states[j]->param);
++                                          break;
++                                        default:
++                                          break;              

 +                                      }
 +                                      copy_to_user(pdata, line, len);
 +                                      pdata += len;
 +                                      totallen += len;
 +                                      }
 +                                      copy_to_user(pdata, line, len);
 +                                      pdata += len;
 +                                      totallen += len;

-+

 +                                      len = 0;
 +                              }
 +                                      len = 0;
 +                              }

-+                      }
++                      } 

 +              }
 +              }

++

 +      }
 +      }

-+      /* Return with configuration information for LEDs */
++
++      len = sprintf(line, "Module ID = 2(system led)\n");
++      copy_to_user(pdata, line, len);
++      pdata += len;
++      totallen += len;
++      len = 0;
++      switch(sys_mod_state)
++      {
++              case 1:
++                      len = sprintf(line, "State = OFF\n");
++                      break;
++              case 2: 
++                      len = sprintf(line, "State = Booting\n");
++                      break;
++              case 3:
++                      len = sprintf(line, "State = System Ready\n");
++                      break;
++              case 4:
++                      len = sprintf(line, "State = System Failure\n");
++                      break;
++              default:
++                      break;
++      }
++      copy_to_user(pdata, line, len);
++      pdata += len;
++      totallen += len;
++      len = 0;
++      
++      len = sprintf(line, "Module ID = 3(WAN led)\n");
++      copy_to_user(pdata, line, len);
++      pdata += len;
++      totallen += len;
++      len = 0;
++      switch(wan_mod_state)
++      {
++              case 1:
++                      len = sprintf(line, "State = OFF\n");
++                      break;
++              case 2:
++                      len = sprintf(line, "State = Wan Connected\n");
++                      break;
++              case 3:
++                      len = sprintf(line, "State = Wan Tx/Rx Activity\n");
++                      break;
++              case 4:
++                      len = sprintf(line, "State = Wan Connect Failure\n");
++                      break;
++              default:
++                      break;
++      }
++      copy_to_user(pdata, line, len);
++      pdata += len;
++      totallen += len;
++      len = 0;
++
++//wwzh for wireless
++#if 0
++      len = sprintf(line, "Module ID = 4(WLAN led)\n");
++      copy_to_user(pdata, line, len);
++      pdata += len;
++      totallen += len;
++      len = 0;
++      switch(wlan_mod_state)
++      {
++              case 1:
++                      len = sprintf(line, "State = OFF\n");
++                      break;
++              case 2:
++                      len = sprintf(line, "State = wlan Ready\n");
++                      break;
++              case 3:
++                      len = sprintf(line, "State = wlan rx/tx activity\n");
++                      break;
++              default:
++                      break; 
++      }
++      copy_to_user(pdata, line, len);
++      pdata += len;
++      totallen += len;
++      len = 0;
++#endif //for wireless
++      

 +      *offp = totallen;
 +      return totallen;
 +}
 +      *offp = totallen;
 +      return totallen;
 +}

-+
-+static ssize_t proc_write_led_fops(struct file *filp, const char *buffer, size_t count, loff_t * offp)
++static ssize_t proc_write_led_fops(struct file *filp,const char *buffer,
++                                               size_t count , loff_t *offp)

 +{
 +      char *pdata = NULL, *ptemp = NULL;
 +      char line[10], temp[10];
 +      int i = 0;
 +{
 +      char *pdata = NULL, *ptemp = NULL;
 +      char line[10], temp[10];
 +      int i = 0;

-+      int mod = 0xFFFF, state = 0xFFFF;
++      int mod = 0xffff, state = 0xffff;

 +      int flag = 0;
 +
 +      int flag = 0;
 +

-+      /* Check if this write is for configuring stuff */
-+      if (*(int *) (buffer) == 0xFFEEDDCC) {
-+              printk("<1>proc write:Calling Configuration\n");
-+              config_led((unsigned long) (buffer + sizeof(int)));
-+              return count;
++       /* Check if this write is for configuring ADSL */
++      if( *(int *)(buffer) == 0xFFEEDDCC )
++      {
++               printk("<1>proc write:Calling Configuration\n");
++               config_led((unsigned long)(buffer + sizeof(int)) );
++               return count;

 +      }
 +
 +      }
 +

-+      if (count >= 10) {
-+              printk("<1>proc write:Input too long,max length = %d\n", 10);
++      if (count > 10)
++      {
++              printk("<1> proc write: Input too long, max length = 10\n");

 +              return count;
 +      }
 +      memset(temp, 0x00, 10);
 +              return count;
 +      }
 +      memset(temp, 0x00, 10);


@@ -406,41 +1241,51 @@ diff -urN linux.old/drivers/char/avalanche_led/ledmod.c linux.dev/drivers/char/a
 +      copy_from_user(line, buffer, count);
 +      line[count] = 0x00;
 +      pdata = line;
 +      copy_from_user(line, buffer, count);
 +      line[count] = 0x00;
 +      pdata = line;

-+      ptemp = temp;
-+      while (flag == 0) {
++      ptemp = temp;   
++      
++      while (flag == 0)
++      {

 +              if (i > 10)
 +                      break;
 +              if (i > 10)
 +                      break;

-+              if (((*pdata) >= '0') && ((*pdata) <= '9')) {
++              if (((*pdata) >= '0') && ((*pdata) <= '9'))
++              {

 +                      *ptemp = *pdata;
 +                      ptemp++;
 +                      *ptemp = *pdata;
 +                      ptemp++;

-+              } else if ((*pdata) == ',') {
++              }
++              else if ((*pdata) == ',')
++              {

 +                      *ptemp = 0x00;
 +                      flag = 1;
 +              }
 +              pdata++;
 +              i++;
 +                      *ptemp = 0x00;
 +                      flag = 1;
 +              }
 +              pdata++;
 +              i++;

-+      };
++      }

 +      if (flag == 1)
 +              mod = led_atoi(temp);
 +      else
 +              return count;
 +      if (flag == 1)
 +              mod = led_atoi(temp);
 +      else
 +              return count;

-+
++      

 +      ptemp = temp;
 +      *ptemp = 0x00;
 +      flag = 0;
 +      ptemp = temp;
 +      *ptemp = 0x00;
 +      flag = 0;

-+      while (flag == 0) {
++      
++      while(flag == 0)
++      {

 +              if (i > 10)
 +                      break;
 +              if (i > 10)
 +                      break;

-+              if (((*pdata) >= '0') && ((*pdata) <= '9')) {
++              if (((*pdata) >= '0') && ((*pdata) <= '9'))
++              {

 +                      *ptemp = *pdata;
 +                      ptemp++;
 +                      *ptemp = *pdata;
 +                      ptemp++;

-+              } else if ((*pdata) == 0x00) {
++              }
++              else if ((*pdata) == 0x00)
++              {

 +                      *ptemp = 0x00;
 +                      flag = 1;
 +              }
 +              pdata++;
 +              i++;
 +                      *ptemp = 0x00;
 +                      flag = 1;
 +              }
 +              pdata++;
 +              i++;

-+      };
++      }

 +      if (flag == 1)
 +              state = led_atoi(temp);
 +      else
 +      if (flag == 1)
 +              state = led_atoi(temp);
 +      else


@@ -448,230 +1293,171 @@ diff -urN linux.old/drivers/char/avalanche_led/ledmod.c linux.dev/drivers/char/a
 +      if ((mod == 0xFFFF) || (state == 0xFFFF))
 +              return count;
 +      else
 +      if ((mod == 0xFFFF) || (state == 0xFFFF))
 +              return count;
 +      else

-+              led_operation(mod, state);
-+      return count;
++      {
++              if (mod != 4)
++                      led_active(mod, state); 
++              else 
++                      led_operation(mod, state);
++      } 
++      return 1;

 +}
 +}

-+
++#endif
++/************end *******************/

 +static int config_led(unsigned long y)
 +{
 +static int config_led(unsigned long y)
 +{

-+      config_elem_t *pcfg = NULL;
-+      char *pdata = NULL;
-+      int i;
-+      int length = 0, number = 0;
++  config_elem_t *pcfg = NULL;
++  char *pdata = NULL;
++  int i;
++  int length = 0 , number = 0;

 +      unsigned int flags;
 +
 +      spin_lock_irqsave(&config_lock, flags);
 +
 +      unsigned int flags;
 +
 +      spin_lock_irqsave(&config_lock, flags);
 +

-+      /* ioctl to configure */
-+      length = *((int *) y);
-+      pdata = (char *) y + sizeof(int);
-+      number = (length - sizeof(int)) / sizeof(config_elem_t);
-+      pcfg = (config_elem_t *) (pdata);
-+
-+      /* Check if an earlier configuration exists IF yes free it up */
-+      free_memory();
-+
-+      for (i = 0; i < number; i++) {
-+              /* If no structure has been allocated for the module do so */
-+              if (modArr[pcfg->name] == NULL) {
-+                      printk("<1>module =  %d\n", pcfg->name);
-+                      if (pcfg->name >= MAX_MOD_ID) {
-+                              printk
-+                                      ("<1>Exiting Configuration: Module ID too large %d\n",
-+                                       pcfg->name);
-+                              free_memory();
-+                              spin_unlock_irqrestore(&config_lock, flags);
-+                              return -1;
-+                      }
-+                      modArr[pcfg->name] = kmalloc(sizeof(mod_entry_t), GFP_KERNEL);
-+                      if (modArr[pcfg->name] == NULL) {
-+                              printk
-+                                      ("<1>Exiting Configuration: Error in allocating memory\n");
-+                              free_memory();
-+                              spin_unlock_irqrestore(&config_lock, flags);
-+                              return -1;
++    /* ioctl to configure */
++    length =  *((int*)y);
++    pdata = (char *)y + sizeof(int);
++    number =  (length - sizeof(int))/sizeof(config_elem_t);
++    pcfg = (config_elem_t *)(pdata);
++
++    /* Check if an earlier configuration exists IF yes free it up */
++    free_memory();
++
++    for ( i = 0 ; i < number ; i++ )
++    {
++                      /* If no structure has been allocated for the module do so */
++      if ( modArr[pcfg->name] == NULL )
++                      {
++                                      printk("<1>module =  %d\n",pcfg->name);
++        if( pcfg->name >= MAX_MOD_ID)
++                              {
++                                      printk("<1>Exiting Configuration: Module ID too large %d\n",pcfg->name);
++                                      free_memory();
++                                      spin_unlock_irqrestore(&config_lock, flags);
++                                      return -1;
++                              }
++        modArr[pcfg->name] = kmalloc(sizeof(mod_entry_t),GFP_KERNEL);
++        if(modArr[pcfg->name] == NULL)
++                              {
++                                      printk("<1>Exiting Configuration: Error in allocating memory\n");
++                                      free_memory();
++                                      spin_unlock_irqrestore(&config_lock, flags);
++                                      return -1;
++                              }
++                              memset( modArr[pcfg->name], 0x00, sizeof(mod_entry_t));

 +                      }
 +                      }

-+                      memset(modArr[pcfg->name], 0x00, sizeof(mod_entry_t));
-+              }

 +
 +

-+              /* if no structure is allocated previously for this state
-+                 allocate a structure, if it's already there fill it up */
-+              if (modArr[pcfg->name]->states[pcfg->state] == NULL) {
-+                      printk("<1>STATE =  %d\n", pcfg->state);
-+                      if (pcfg->state >= MAX_STATE_ID) {
-+                              printk("<1>Exiting Configuration: State ID too large\n");
-+                              free_memory();
-+                              spin_unlock_irqrestore(&config_lock, flags);
-+                              return -1;
++      /* if no structure is allocated previously for this state
++         allocate a structure, if it's already there fill it up */
++                      if( modArr[pcfg->name]->states[pcfg->state] == NULL)
++                      {
++                                      printk("<1>STATE =  %d\n",pcfg->state);
++                              if( pcfg->state >= MAX_STATE_ID)
++                              {
++                                      printk("<1>Exiting Configuration: State ID too large\n");
++                                      free_memory();
++                                      spin_unlock_irqrestore(&config_lock, flags);
++                                      return -1;
++                              }
++                              modArr[pcfg->name]->states[pcfg->state] =
++                        kmalloc(sizeof(state_entry_t),GFP_KERNEL);
++                              if( modArr[pcfg->name]->states[pcfg->state] == NULL)
++                              {
++                                      free_memory();
++                                      spin_unlock_irqrestore(&config_lock, flags);
++                                      return -1;
++                              }
++                              memset( modArr[pcfg->name]->states[pcfg->state], 0x00, sizeof(state_entry_t));

 +                      }
 +                      }

-+                      modArr[pcfg->name]->states[pcfg->state] =
-+                              kmalloc(sizeof(state_entry_t), GFP_KERNEL);
-+                      if (modArr[pcfg->name]->states[pcfg->state] == NULL) {
++                      /* Fill up the fields of the state */
++      if( pcfg->led >= MAX_LED_ID)
++                      {
++                              printk("<1>led =  %d\n",pcfg->led);

 +                              free_memory();
 +                              spin_unlock_irqrestore(&config_lock, flags);
 +                              return -1;
 +                      }
 +                              free_memory();
 +                              spin_unlock_irqrestore(&config_lock, flags);
 +                              return -1;
 +                      }

-+                      memset(modArr[pcfg->name]->states[pcfg->state], 0x00,
-+                                 sizeof(state_entry_t));
-+              }
-+              /* Fill up the fields of the state */
-+              if (pcfg->led >= MAX_LED_ID) {
-+                      printk("<1>led =  %d\n", pcfg->led);
-+                      free_memory();
-+                      spin_unlock_irqrestore(&config_lock, flags);
-+                      return -1;
-+              }
-+              modArr[pcfg->name]->states[pcfg->state]->led = pcfg->led;
-+              modArr[pcfg->name]->states[pcfg->state]->mode = pcfg->mode;
-+              modArr[pcfg->name]->states[pcfg->state]->param = pcfg->param;
-+              switch (pcfg->mode) {
-+              case 1:
-+                      modArr[pcfg->name]->states[pcfg->state]->handler =
-+                              board_led_link_down;
-+                      break;
-+              case 2:
-+              case 3:
-+              case 5:
-+                      if (pcfg->mode == 2)
-+                              modArr[pcfg->name]->states[pcfg->state]->handler =
-+                                      board_led_activity_on;
-+                      else if (pcfg->mode == 3)
-+                              modArr[pcfg->name]->states[pcfg->state]->handler =
-+                                      board_led_activity_off;
-+                      else
-+                              modArr[pcfg->name]->states[pcfg->state]->handler =
-+                                      board_led_link_flash;
-+                      break;
-+              case 4:
-+                      modArr[pcfg->name]->states[pcfg->state]->handler =
-+                              board_led_link_up;
-+                      break;
-+              default:
-+                      printk("<1>Exiting Configuration: Unknown LED Mode\n");
-+                      free_memory();
-+                      spin_unlock_irqrestore(&config_lock, flags);
-+                      return -1;
-+              }
-+              pcfg++;
-+      }
++      modArr[pcfg->name]->states[pcfg->state]->led = pcfg->led;
++      modArr[pcfg->name]->states[pcfg->state]->mode = pcfg->mode;
++      modArr[pcfg->name]->states[pcfg->state]->param = pcfg->param;
++                      switch(pcfg->mode)
++                      {
++                              case 1:
++                      modArr[pcfg->name]->states[pcfg->state]->handler = board_led_link_down;
++                                      break;
++                              case 2:
++                              case 3:
++                              case 5:
++                                      if( pcfg->mode == 2 )
++                                              modArr[pcfg->name]->states[pcfg->state]->handler = board_led_activity_on;
++                                      else if( pcfg->mode == 3)
++                              modArr[pcfg->name]->states[pcfg->state]->handler = board_led_activity_off;
++                                      else
++                      modArr[pcfg->name]->states[pcfg->state]->handler = board_led_link_flash;
++                                      break;
++                              case 4:
++                      modArr[pcfg->name]->states[pcfg->state]->handler = board_led_link_up;
++                                      break;
++                              default:
++                                printk("<1>Exiting Configuration: Unknown LED Mode\n");
++                                      free_memory();
++                                      spin_unlock_irqrestore(&config_lock, flags);
++                                      return -1;
++                      }
++                      pcfg++;                 
++    }

 +      spin_unlock_irqrestore(&config_lock, flags);
 +      spin_unlock_irqrestore(&config_lock, flags);

-+      return 0;
++  return 0;

 +}
 +
 +
 +int __init led_init(void)
 +{
 +
 +}
 +
 +
 +int __init led_init(void)
 +{
 +

-+      /* Clear our memory */
-+      memset(modArr, 0x00, sizeof(mod_entry_t *) * MAX_MOD_ID);
-+      memset(led_arr, 0x00, sizeof(led_data_t *) * MAX_LED_ID);
++  /* Clear our memory */
++  memset(modArr,0x00,sizeof(mod_entry_t *)*MAX_MOD_ID);
++  memset(led_arr,0x00,sizeof(led_data_t *)*MAX_LED_ID);

 +
 +      /* Create spin lock for config data structure */
 +
 +      /* Create spin lock for config data structure */

-+      config_lock = SPIN_LOCK_UNLOCKED;
-+
-+#if 0
-+      /* Create directory */
-+      led_proc_dir = proc_mkdir("led_mod", NULL);
-+      if (led_proc_dir == NULL)
-+              goto out;
-+#endif
-+      
-+      /* Create adsl file */
-+      led_file = create_proc_entry("led", 0777, NULL);
-+      if (led_file == NULL)
-+              goto led_file;
-+
-+      led_file->owner = THIS_MODULE;
-+      led_file->proc_fops = &led_fops;
-+
-+      memset(modArr, 0x00, sizeof(mod_entry_t *) * MAX_MOD_ID);
-+
-+      /* Ron add for ADSL LED blink */
-+      my_mode = 1;
-+      my_led_init(GPIO_ADSL_ACT, 0, -1);
-+      my_led_init(GPIO_ADSL_DOWN, 0, -1);
-+      init_timer(&my_led_timer);
-+      my_led_timer.function = my_led_blink_timer;
-+      my_led_timer.data = 0;
-+      my_led_timer.expires = jiffies + BLINK_SLOW;
-+      add_timer(&my_led_timer);
-+      /* Ron add for ADSL LED blink */
-+      return 0;
++      config_lock=SPIN_LOCK_UNLOCKED;
++
++  /* Create directory */
++  led_proc_dir = proc_mkdir("led", NULL);
++  if( led_proc_dir == NULL )
++    goto out;
++
++  /* Create adsl file */
++  led_file = create_proc_entry("led", 0777, led_proc_dir);
++  if( led_file == NULL)
++    goto led_file;
++  led_file->owner = THIS_MODULE;
++  led_file->proc_fops = &led_fops;
++
++  memset( modArr , 0x00 , sizeof(mod_entry_t *) * MAX_MOD_ID);
++      /* Reset the GPIO pins  */
++  board_gpio_init();
++
++      /* Register the UART controlled LEDS  */
++  uart_led_init();
++  /* Create the usb proc file */
++      avalanche_leds_init();
++  return 0;

 +
 +  led_file:
 +
 +  led_file:

-+      remove_proc_entry("led", NULL);
++    remove_proc_entry("led",led_proc_dir);

 +  out:
 +  out:

-+      return 0;
++    return 0;

 +
 +}
 +
 +
 +}
 +

-+void led_exit(void)
++void led_exit()

 +{
 +{

-+      remove_proc_entry("led", NULL);
++      remove_proc_entry("led", led_proc_dir);

 +}
 +
 +}
 +

-+void led_operation(int mod, int state)
-+{
-+
-+      unsigned int flags;
-+
-+      spin_lock_irqsave(&config_lock, flags);
-+#if 1
-+      /* Ron Add for ADSL LED blink */
-+      //printk("mod==%d state==%d\n",mod,state);
-+
-+      if (mod == 1) {
-+              switch (state) {
-+                      /* off */
-+              case 1:
-+                      my_mode = 1;
-+                      my_blink_count = 0;
-+                      my_led_off(GPIO_ADSL_ACT, -1);
-+                      my_led_off(GPIO_ADSL_DOWN, -1);
-+                      break;
-+                      /* sync */
-+              case 2:
-+                      if (my_mode == 1) {
-+                              my_mode = 2;
-+                              my_led_off(GPIO_ADSL_ACT, -1);
-+                              my_blink_count++;
-+                      }
-+                      break;
-+                      /* on */
-+              case 3:
-+                      my_mode = 3;
-+                      my_blink_count = 0;
-+                      my_led_off(GPIO_ADSL_DOWN, -1);
-+                      my_led_on(GPIO_ADSL_ACT, -1);
-+                      break;
-+                      /* off */
-+              case 4:
-+                      my_mode = 4;
-+                      my_led_off(GPIO_ADSL_DOWN, -1);
-+                      my_blink_count++;
-+                      break;
-+              }
-+      }                                                       /* Ron add for ADSL LED Blink */
-+#endif
-+      if ((mod >= MAX_MOD_ID) || (state >= MAX_STATE_ID)) {
-+              spin_unlock_irqrestore(&config_lock, flags);
-+              return;
-+      }
-+      if (modArr[mod] == NULL) {
-+              spin_unlock_irqrestore(&config_lock, flags);
-+              return;
-+      }
-+      if (modArr[mod]->states[state] == NULL) {
-+              spin_unlock_irqrestore(&config_lock, flags);
-+              return;
-+      }
-+      /* Call the function handler  */
-+      modArr[mod]->states[state]->handler(modArr[mod]->states[state]);
-+
-+      spin_unlock_irqrestore(&config_lock, flags);
-+}
++module_init(led_init);
++module_exit(led_exit);

 +
 +

-+void register_led_drv(int device, led_reg_t * pInfo)
++void register_led_drv( int device , led_reg_t *pInfo)

 +{
 +      unsigned int flags;
 +      struct timer_list *pTimer = NULL;
 +{
 +      unsigned int flags;
 +      struct timer_list *pTimer = NULL;


@@ -679,51 +1465,185 @@ diff -urN linux.old/drivers/char/avalanche_led/ledmod.c linux.dev/drivers/char/a
 +      spin_lock_irqsave(&config_lock, flags);
 +
 +      led_arr[device].led = pInfo;
 +      spin_lock_irqsave(&config_lock, flags);
 +
 +      led_arr[device].led = pInfo;

-+      if (led_arr[device].led->init != 0x00)
-+              led_arr[device].led->init(led_arr[device].led->param);
-+      if (led_arr[device].led->offfunc != 0x00)
-+              led_arr[device].led->offfunc(led_arr[device].led->param);
++      if( led_arr[device].led->init != 0x00)
++      led_arr[device].led->init(led_arr[device].led->param);
++      if( led_arr[device].led->offfunc != 0x00)
++      led_arr[device].led->offfunc(led_arr[device].led->param);

 +
 +      /* Create a timer for blinking   */
 +
 +      /* Create a timer for blinking   */

-+      pTimer = kmalloc(sizeof(struct timer_list), GFP_KERNEL);
-+      init_timer(pTimer);
++  pTimer = kmalloc(sizeof(struct timer_list),GFP_KERNEL);
++      init_timer( pTimer );

 +      pTimer->function = led_timer_func;
 +      pTimer->data = 0;
 +      pTimer->function = led_timer_func;
 +      pTimer->data = 0;

-+      led_arr[device].pTimer = pTimer;
-+      led_arr[device].timer_running = 0;
++  led_arr[device].pTimer = pTimer;
++  led_arr[device].timer_running = 0;

 +
 +      spin_unlock_irqrestore(&config_lock, flags);
 +
 +
 +      spin_unlock_irqrestore(&config_lock, flags);
 +

-+      return;
++  return;

 +}
 +
 +}
 +

-+void deregister_led_drv(int device)
++void deregister_led_drv( int device)

 +{
 +      unsigned int flags;
 +
 +      spin_lock_irqsave(&config_lock, flags);
 +      led_arr[device].led = NULL;
 +
 +{
 +      unsigned int flags;
 +
 +      spin_lock_irqsave(&config_lock, flags);
 +      led_arr[device].led = NULL;
 +

-+      if (led_arr[device].pTimer != NULL) {
++      if( led_arr[device].pTimer != NULL)
++      {

 +              del_timer(led_arr[device].pTimer);
 +              kfree(led_arr[device].pTimer);
 +      }
 +      spin_unlock_irqrestore(&config_lock, flags);
 +
 +              del_timer(led_arr[device].pTimer);
 +              kfree(led_arr[device].pTimer);
 +      }
 +      spin_unlock_irqrestore(&config_lock, flags);
 +

-+      return;
++  return;

 +}
 +
 +}
 +

-+module_init(led_init);
-+module_exit(led_exit);
-+
-+
-+EXPORT_SYMBOL_NOVERS(led_init);

 +EXPORT_SYMBOL_NOVERS(led_operation);
 +EXPORT_SYMBOL_NOVERS(register_led_drv);
 +EXPORT_SYMBOL_NOVERS(deregister_led_drv);
 +EXPORT_SYMBOL_NOVERS(led_operation);
 +EXPORT_SYMBOL_NOVERS(register_led_drv);
 +EXPORT_SYMBOL_NOVERS(deregister_led_drv);

++
+diff -urN linux.old/drivers/char/avalanche_led/leds.c linux.dev/drivers/char/avalanche_led/leds.c
+--- linux.old/drivers/char/avalanche_led/leds.c        1970-01-01 01:00:00.000000000 +0100
++++ linux.dev/drivers/char/avalanche_led/leds.c        2005-07-12 03:08:48.265220512 +0200
+@@ -0,0 +1,133 @@
++#include <linux/config.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <asm/ar7/avalanche_regs.h>
++#include <linux/spinlock.h>
++#include <linux/timer.h>
++#include <linux/sched.h>
++#include <linux/module.h>
++#include <linux/proc_fs.h>
++#include <asm/uaccess.h>
++#include <linux/fs.h>
++
++#include <asm/ar7/ledapp.h>
++
++#if defined(CONFIG_AR5D01) || defined(CONFIG_AR5W01) || defined(CONFIG_AR7)
++
++#define ETH_MASK 0x01
++#define USB_MASK 0x02
++
++static struct proc_dir_entry *usb_file;
++static ssize_t proc_read_usb_fops(struct file *filp,
++                                 char *buf,size_t count , loff_t *offp);
++struct file_operations usb_fops = {read: proc_read_usb_fops};
++
++typedef struct mod_states{
++  int module;
++  int activity;
++  int linkup;
++  int idle;
++}mod_states_t;
++
++mod_states_t state_arr[] = {
++                              { MOD_ETH,DEF_ETH_ACTIVITY,DEF_ETH_LINK_UP,DEF_ETH_IDLE },
++                              { MOD_USB,DEF_USB_ACTIVITY,DEF_USB_LINK_UP,DEF_USB_IDLE },
++                              { MOD_LAN,DEF_LAN_ACTIVITY,DEF_LAN_LINK_UP,DEF_LAN_IDLE }
++                              };
++
++unsigned char device_links = 0;       /* Bitmask with the devices that are up */
++
++
++void avalanche_led_activity_pulse(unsigned long device)
++{
++      /* If device link is not up return */
++  if( !(device_links & (unsigned char)(1 << device)))
++              return;
++#ifdef MULTIPLEX_LED
++      led_operation( state_arr[2].module, state_arr[2].activity);
++#else
++      led_operation( state_arr[device].module, state_arr[device].activity);
++#endif
++}
++
++void avalanche_led_link_up( unsigned long device )
++{
++      
++  /* If already UP ignore */
++  if( device_links & (unsigned char)(1 << device))
++              return;
++  /* Turn on the bit for the device */
++      device_links |= (unsigned char)(1 << device);
++#ifdef MULTIPLEX_LED
++      led_operation( state_arr[2].module, state_arr[2].linkup);
++#else
++      led_operation( state_arr[device].module, state_arr[device].linkup);
++#endif
++}
++
++void avalanche_led_link_down ( unsigned long device )
++{
++
++  /* If already DOWN ignore */
++  if( !(device_links & (unsigned char)(1 << device)))
++              return;
++
++      /* Turn off the bit for the device */
++      device_links &= ~(unsigned char)(1 << device);
++#ifdef MULTIPLEX_LED
++      /* If no links, then shut the LED off  */
++      if(!device_links)
++              led_operation( state_arr[2].module, state_arr[2].idle);
++#else
++      led_operation( state_arr[device].module, state_arr[device].idle);
++#endif
++}
++
++static ssize_t proc_read_usb_fops(struct file *filp,
++                                 char *buf,size_t count , loff_t *offp)
++{
++  char * pdata = NULL;
++  char line[3];
++  if( *offp != 0 )
++      return 0;
++  pdata = buf;
++  if( device_links & USB_MASK)
++      sprintf(line,"%s\n","1");
++  else
++      sprintf(line,"%s\n","0");
++  copy_to_user(pdata,line,2);
++      *offp = 2;
++      return 2;
++}
++
++
++void avalanche_leds_init(void)
++{
++  /* Create usb link proc file */
++  usb_file = create_proc_entry("avalanche/usb_link", 0444, NULL);
++  if( usb_file == NULL)
++    return;
++  usb_file->owner = THIS_MODULE;
++  usb_file->proc_fops = &usb_fops;
++      return;
++}
++
++EXPORT_SYMBOL(avalanche_led_activity_pulse);
++EXPORT_SYMBOL(avalanche_led_link_up);
++EXPORT_SYMBOL(avalanche_led_link_down);
++
++#else
++/* We make a dummy init routine for the platforms that do not support this led
++   API
++*/
++
++void avalanche_leds_init(void)
++{
++}
++
++#endif
++
++
++
++
++

 diff -urN linux.old/drivers/char/avalanche_led/Makefile linux.dev/drivers/char/avalanche_led/Makefile
 --- linux.old/drivers/char/avalanche_led/Makefile      1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/drivers/char/avalanche_led/Makefile linux.dev/drivers/char/avalanche_led/Makefile
 --- linux.old/drivers/char/avalanche_led/Makefile      1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/char/avalanche_led/Makefile      2005-07-11 02:42:24.191796312 +0200
++++ linux.dev/drivers/char/avalanche_led/Makefile      2005-07-12 03:08:48.265220512 +0200

 @@ -0,0 +1,23 @@
 +# File: drivers/char/avalanche_led/Makefile
 +#
 @@ -0,0 +1,23 @@
 +# File: drivers/char/avalanche_led/Makefile
 +#


@@ -737,9 +1657,9 @@ diff -urN linux.old/drivers/char/avalanche_led/Makefile linux.dev/drivers/char/a
 +
 +EXTRA_CFLAGS := -I$(TOPDIR)/include/asm/ar7
 +
 +
 +EXTRA_CFLAGS := -I$(TOPDIR)/include/asm/ar7
 +

-+export-objs := ledmod.o
++export-objs := ledmod.o leds.o

 +
 +

-+avalanche_led-objs := ledmod.o
++avalanche_led-objs := ledmod.o gpio.o uartled.o leds.o

 +
 +include $(TOPDIR)/Rules.make
 +
 +
 +include $(TOPDIR)/Rules.make
 +


@@ -748,9 +1668,68 @@ diff -urN linux.old/drivers/char/avalanche_led/Makefile linux.dev/drivers/char/a
 +
 +clean:
 +      rm -f core *.o *.a *.s
 +
 +clean:
 +      rm -f core *.o *.a *.s

+diff -urN linux.old/drivers/char/avalanche_led/uartled.c linux.dev/drivers/char/avalanche_led/uartled.c
+--- linux.old/drivers/char/avalanche_led/uartled.c     1970-01-01 01:00:00.000000000 +0100
++++ linux.dev/drivers/char/avalanche_led/uartled.c     2005-07-12 03:08:48.266220360 +0200
+@@ -0,0 +1,55 @@
++#include <linux/kernel.h>
++#include <asm/uaccess.h>
++#include <linux/spinlock.h>
++#include <asm/ar7/avalanche_regs.h>
++#include <asm/ar7/ledapp.h>
++
++#define UART_LED_REG  (*(volatile unsigned int *)(UARTA_BASE + 0x10))
++
++static spinlock_t     device_lock;
++led_reg_t temp1[2];
++
++static void uart_led_on(unsigned long param)
++{
++  unsigned long flags;
++
++  spin_lock_irqsave(&device_lock,flags);
++  UART_LED_REG &= 0xFFFD;
++  spin_unlock_irqrestore(&device_lock, flags);
++}
++
++static void uart_led_off ( unsigned long param )
++{
++   unsigned int flags = 0x00;
++   spin_lock_irqsave(&device_lock, flags);
++   UART_LED_REG |= 0x02;
++      spin_unlock_irqrestore(&device_lock, flags);
++}
++
++void uart_led_init(void)
++{
++
++#if defined(CONFIG_AR5D01)
++  /* Register led 6 UART Pin 1 */
++  temp1[0].param = 0;
++  temp1[0].init = NULL;
++  temp1[0].onfunc = uart_led_on;
++  temp1[0].offfunc = uart_led_off;
++      register_led_drv( 6 , &temp1[0]);
++#endif
++
++#if defined(CONFIG_AR5W01)
++  /* Register led 8 UART Pin 1 */
++  temp1[0].param = 0;
++  temp1[0].init = NULL;
++  temp1[0].onfunc = uart_led_on;
++  temp1[0].offfunc = uart_led_off;
++      register_led_drv( 8 , &temp1[0]);
++#endif
++
++      /* Initialize the link mask */
++      device_lock = SPIN_LOCK_UNLOCKED;
++
++  return;
++}
++

 diff -urN linux.old/drivers/char/Config.in linux.dev/drivers/char/Config.in
 --- linux.old/drivers/char/Config.in   2005-07-10 20:53:55.650624032 +0200
 diff -urN linux.old/drivers/char/Config.in linux.dev/drivers/char/Config.in
 --- linux.old/drivers/char/Config.in   2005-07-10 20:53:55.650624032 +0200

-+++ linux.dev/drivers/char/Config.in   2005-07-10 20:50:43.556826000 +0200
++++ linux.dev/drivers/char/Config.in   2005-07-12 03:07:20.861507896 +0200

 @@ -133,6 +133,10 @@
        fi
     fi
 @@ -133,6 +133,10 @@
        fi
     fi


@@ -764,7 +1743,7 @@ diff -urN linux.old/drivers/char/Config.in linux.dev/drivers/char/Config.in
  fi
 diff -urN linux.old/drivers/char/Makefile linux.dev/drivers/char/Makefile
 --- linux.old/drivers/char/Makefile    2005-07-10 20:53:55.651623880 +0200
  fi
 diff -urN linux.old/drivers/char/Makefile linux.dev/drivers/char/Makefile
 --- linux.old/drivers/char/Makefile    2005-07-10 20:53:55.651623880 +0200

-+++ linux.dev/drivers/char/Makefile    2005-07-10 20:50:43.556826000 +0200
++++ linux.dev/drivers/char/Makefile    2005-07-12 03:07:20.861507896 +0200

 @@ -190,6 +190,19 @@
    obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
  endif
 @@ -190,6 +190,19 @@
    obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
  endif


@@ -787,7 +1766,7 @@ diff -urN linux.old/drivers/char/Makefile linux.dev/drivers/char/Makefile
  obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
 diff -urN linux.old/include/asm-mips/ar7/ledapp.h linux.dev/include/asm-mips/ar7/ledapp.h
 --- linux.old/include/asm-mips/ar7/ledapp.h    1970-01-01 01:00:00.000000000 +0100
  obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
 diff -urN linux.old/include/asm-mips/ar7/ledapp.h linux.dev/include/asm-mips/ar7/ledapp.h
 --- linux.old/include/asm-mips/ar7/ledapp.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/include/asm-mips/ar7/ledapp.h    2005-07-10 20:50:43.557826000 +0200
++++ linux.dev/include/asm-mips/ar7/ledapp.h    2005-07-12 03:08:48.266220360 +0200

 @@ -0,0 +1,59 @@
 +#ifndef __LED_APP__
 +#define __LED_APP__
 @@ -0,0 +1,59 @@
 +#ifndef __LED_APP__
 +#define __LED_APP__

diff --git a/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch b/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch
index 58c697e..e2b2ddd 100644 (file)
--- a/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch
+++ b/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch
@@ -1,6 +1,6 @@
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.c     1970-01-01 01:00:00.000000000 +0100
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.c     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.c     2005-07-10 04:06:50.491302256 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.c     2005-07-12 02:48:41.996601000 +0200

 @@ -0,0 +1,728 @@
 +#ifndef _INC_CPCOMMON_C
 +#define _INC_CPCOMMON_C
 @@ -0,0 +1,728 @@
 +#ifndef _INC_CPCOMMON_C
 +#define _INC_CPCOMMON_C


@@ -732,7 +732,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.c linux.dev/drive
 +#endif  /* _INC  */
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h     1970-01-01 01:00:00.000000000 +0100
 +#endif  /* _INC  */
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.h     2005-07-10 03:22:40.508160000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.h     2005-07-12 02:48:41.996601000 +0200

 @@ -0,0 +1,79 @@
 +#ifndef _INC_CPCOMMON_H
 +#define _INC_CPCOMMON_H
 @@ -0,0 +1,79 @@
 +#ifndef _INC_CPCOMMON_H
 +#define _INC_CPCOMMON_H


@@ -815,7 +815,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h linux.dev/drive
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmac.c      1970-01-01 01:00:00.000000000 +0100
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmac.c      1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpmac.c      2005-07-10 07:39:15.514764184 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmac.c      2005-07-12 03:21:00.298934472 +0200

 @@ -0,0 +1,2509 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Network Device Driver Source
 @@ -0,0 +1,2509 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Network Device Driver Source


@@ -1774,9 +1774,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +        dbgPrint("Maintaining the link up loopback for %s.\n", p_dev->name);
 +      netif_carrier_on(p_dev);
 +
 +        dbgPrint("Maintaining the link up loopback for %s.\n", p_dev->name);
 +      netif_carrier_on(p_dev);
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+        avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//        avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
++//#endif

 +
 +        return(0);
 +    }
 +
 +        return(0);
 +    }


@@ -1791,9 +1791,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +      {
 +            netif_carrier_on(p_cpmac_priv->owner);
 +
 +      {
 +            netif_carrier_on(p_cpmac_priv->owner);
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+            avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//            avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
++//#endif

 +          dbgPrint("Found the Link for the CPMAC instance %s.\n", p_dev->name);
 +        }
 +
 +          dbgPrint("Found the Link for the CPMAC instance %s.\n", p_dev->name);
 +        }
 +


@@ -1816,9 +1816,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +
 +          netif_carrier_off(p_dev);
 +
 +
 +          netif_carrier_off(p_dev);
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+            avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//            avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
++//#endif

 +
 +          dbgPrint("Lost the Link for the CPMAC for %s.\n", p_dev->name);
 +      }
 +
 +          dbgPrint("Lost the Link for the CPMAC for %s.\n", p_dev->name);
 +      }


@@ -2307,13 +2307,13 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +    p_cpmac_priv->set_to_close          = 1;
 +    p_cpmac_priv->non_data_irq_expected = 0;
 +
 +    p_cpmac_priv->set_to_close          = 1;
 +    p_cpmac_priv->non_data_irq_expected = 0;
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+    if((p_cpmac_priv->led_handle = avalanche_led_register("cpmac", instance_num)) == NULL)
-+    {
-+        errPrint("Could not allocate handle for CPMAC[%d] LED.\n", instance_num);
-+        goto cpmac_init_mod_error;
-+    }
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//    if((p_cpmac_priv->led_handle = avalanche_led_register("cpmac", instance_num)) == NULL)
++//   {
++//        errPrint("Could not allocate handle for CPMAC[%d] LED.\n", instance_num);
++//       goto cpmac_init_mod_error;
++//    }
++//#endif

 +
 +    if(cpmac_drv_init_module(p_drv_hal, p_dev, instance_num) != 0)
 +    {
 +
 +    if(cpmac_drv_init_module(p_drv_hal, p_dev, instance_num) != 0)
 +    {


@@ -2365,9 +2365,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +
 +    netif_carrier_off(p_dev);
 +
 +
 +    netif_carrier_off(p_dev);
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
++//#endif

 +
 +    /* Tasklet is initialized at the isr registeration time. */
 +    p_drv_hal->hal_funcs->Control(p_drv_hal->hal_dev, "CpmacBase", "Get", &p_dev->base_addr);
 +
 +    /* Tasklet is initialized at the isr registeration time. */
 +    p_drv_hal->hal_funcs->Control(p_drv_hal->hal_dev, "CpmacBase", "Get", &p_dev->base_addr);


@@ -2517,9 +2517,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +        p_cpmac_priv->link_mode         = 1;
 +        netif_carrier_off(p_dev);
 +
 +        p_cpmac_priv->link_mode         = 1;
 +        netif_carrier_off(p_dev);
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+        avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//        avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
++//#endif

 +
 +        clear_bit(0, &p_cpmac_priv->non_data_irq_expected);
 +
 +
 +        clear_bit(0, &p_cpmac_priv->non_data_irq_expected);
 +


@@ -2570,10 +2570,10 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +    int                     val           = 1;
 +    int                     channel       = 0;
 +
 +    int                     val           = 1;
 +    int                     channel       = 0;
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)    
-+    if(netif_carrier_ok(p_dev))
-+       avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)    
++//    if(netif_carrier_ok(p_dev))
++//      avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
++//#endif

 +
 +    if(p_dev->flags & IFF_PROMISC)
 +    {
 +
 +    if(p_dev->flags & IFF_PROMISC)
 +    {


@@ -2739,9 +2739,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +        goto cpmac_dev_tx_drop_pkt; 
 +    }
 +
 +        goto cpmac_dev_tx_drop_pkt; 
 +    }
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_TX_ACTIVITY);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_TX_ACTIVITY);
++//#endif

 +
 +    return(ret_val);
 +
 +
 +    return(ret_val);
 +


@@ -3044,9 +3044,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +
 +    netif_rx(p_skb);
 +
 +
 +    netif_rx(p_skb);
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_RX_ACTIVITY);        
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_RX_ACTIVITY);      
++//#endif

 +
 +    p_cpmac_priv->net_dev_stats.rx_packets++;
 +    p_cpmac_priv->net_dev_stats.rx_bytes += packet_size;
 +
 +    p_cpmac_priv->net_dev_stats.rx_packets++;
 +    p_cpmac_priv->net_dev_stats.rx_bytes += packet_size;


@@ -3294,9 +3294,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +      
 +        cpmac_drv_cleanup(p_cpmac_priv->drv_hal);
 +
 +      
 +        cpmac_drv_cleanup(p_cpmac_priv->drv_hal);
 +

-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+        avalanche_led_unregister(p_cpmac_priv->led_handle);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//        avalanche_led_unregister(p_cpmac_priv->led_handle);
++//#endif

 +      strcpy(proc_name, "avalanche/");
 +        strcat(proc_name, p_dev->name);
 +        proc_category_name_len = strlen(proc_name);
 +      strcpy(proc_name, "avalanche/");
 +        strcat(proc_name, p_dev->name);
 +        proc_category_name_len = strlen(proc_name);


@@ -3328,7 +3328,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +module_exit(cpmac_exit);
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmac.h      1970-01-01 01:00:00.000000000 +0100
 +module_exit(cpmac_exit);
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmac.h      1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpmac.h      2005-07-10 03:22:40.511160000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmac.h      2005-07-12 02:48:42.043594000 +0200

 @@ -0,0 +1,379 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Network Device Driver Header
 @@ -0,0 +1,379 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Network Device Driver Header


@@ -3711,7 +3711,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.h linux.dev/drivers/net/av
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.c linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.c 1970-01-01 01:00:00.000000000 +0100
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.c linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.c 1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.c 2005-07-10 04:06:50.491302256 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.c 2005-07-12 02:48:42.044593000 +0200

 @@ -0,0 +1,492 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Net Driver HAL support Source
 @@ -0,0 +1,492 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Net Driver HAL support Source


@@ -4207,7 +4207,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.c linux.dev/drivers/n
 +}
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.h linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.h 1970-01-01 01:00:00.000000000 +0100
 +}
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.h linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.h 1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.h 2005-07-10 03:22:40.512160000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.h 2005-07-12 02:48:42.044593000 +0200

 @@ -0,0 +1,51 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Device Driver HAL support Header
 @@ -0,0 +1,51 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Device Driver HAL support Header


@@ -4262,7 +4262,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.h linux.dev/drivers/n
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac_reg.h linux.dev/drivers/net/avalanche_cpmac/cpmac_reg.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmac_reg.h  1970-01-01 01:00:00.000000000 +0100
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac_reg.h linux.dev/drivers/net/avalanche_cpmac/cpmac_reg.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmac_reg.h  1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpmac_reg.h  2005-07-10 03:22:40.513160000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmac_reg.h  2005-07-12 02:48:42.045593000 +0200

 @@ -0,0 +1,406 @@
 +/****************************************************************************
 +        TNETD73xx Software Support
 @@ -0,0 +1,406 @@
 +/****************************************************************************
 +        TNETD73xx Software Support


@@ -4672,7 +4672,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac_reg.h linux.dev/drivers/ne
 +#endif _INC_CPMAC_REG
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.c linux.dev/drivers/net/avalanche_cpmac/cpmdio.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmdio.c     1970-01-01 01:00:00.000000000 +0100
 +#endif _INC_CPMAC_REG
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.c linux.dev/drivers/net/avalanche_cpmac/cpmdio.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmdio.c     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpmdio.c     2005-07-10 04:06:50.491302256 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmdio.c     2005-07-12 02:48:42.046593000 +0200

 @@ -0,0 +1,960 @@
 +/***************************************************************************
 +**  TNETD53xx Software Support
 @@ -0,0 +1,960 @@
 +/***************************************************************************
 +**  TNETD53xx Software Support


@@ -5636,7 +5636,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.c linux.dev/drivers/net/a
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.h linux.dev/drivers/net/avalanche_cpmac/cpmdio.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmdio.h     1970-01-01 01:00:00.000000000 +0100
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.h linux.dev/drivers/net/avalanche_cpmac/cpmdio.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmdio.h     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpmdio.h     2005-07-10 03:22:40.515159000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmdio.h     2005-07-12 02:48:42.047593000 +0200

 @@ -0,0 +1,73 @@
 +/*****************************************************************************
 +**      TNETD53xx Software Support
 @@ -0,0 +1,73 @@
 +/*****************************************************************************
 +**      TNETD53xx Software Support


@@ -5713,7 +5713,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.h linux.dev/drivers/net/a
 +#endif  /*  _INC_CPMDIO */
 diff -urN linux.old/drivers/net/avalanche_cpmac/cppi_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cppi_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cppi_cpmac.c 1970-01-01 01:00:00.000000000 +0100
 +#endif  /*  _INC_CPMDIO */
 diff -urN linux.old/drivers/net/avalanche_cpmac/cppi_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cppi_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cppi_cpmac.c 1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cppi_cpmac.c 2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cppi_cpmac.c 2005-07-12 02:48:42.048593000 +0200

 @@ -0,0 +1,1345 @@
 +/*************************************************************************
 + *  TNETDxxxx Software Support
 @@ -0,0 +1,1345 @@
 +/*************************************************************************
 + *  TNETDxxxx Software Support


@@ -7062,7 +7062,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cppi_cpmac.c linux.dev/drivers/n
 +  }
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpremap_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpremap_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpremap_cpmac.c      1970-01-01 01:00:00.000000000 +0100
 +  }
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpremap_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpremap_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpremap_cpmac.c      1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpremap_cpmac.c      2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpremap_cpmac.c      2005-07-12 02:48:42.049593000 +0200

 @@ -0,0 +1,28 @@
 +#ifndef _INC_CPREMAP_C
 +#define _INC_CPREMAP_C
 @@ -0,0 +1,28 @@
 +#ifndef _INC_CPREMAP_C
 +#define _INC_CPREMAP_C


@@ -7094,7 +7094,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpremap_cpmac.c linux.dev/driver
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpswhal_cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpswhal_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpswhal_cpmac.h      1970-01-01 01:00:00.000000000 +0100
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpswhal_cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpswhal_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpswhal_cpmac.h      1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/cpswhal_cpmac.h      2005-07-10 03:22:40.518159000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpswhal_cpmac.h      2005-07-12 02:48:42.050593000 +0200

 @@ -0,0 +1,632 @@
 +/************************************************************************
 + *  TNETDxxxx Software Support
 @@ -0,0 +1,632 @@
 +/************************************************************************
 + *  TNETDxxxx Software Support


@@ -7730,7 +7730,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpswhal_cpmac.h linux.dev/driver
 +#endif  /*  end of _INC_    */
 diff -urN linux.old/drivers/net/avalanche_cpmac/dox_cpmac.h linux.dev/drivers/net/avalanche_cpmac/dox_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/dox_cpmac.h  1970-01-01 01:00:00.000000000 +0100
 +#endif  /*  end of _INC_    */
 diff -urN linux.old/drivers/net/avalanche_cpmac/dox_cpmac.h linux.dev/drivers/net/avalanche_cpmac/dox_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/dox_cpmac.h  1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/dox_cpmac.h  2005-07-10 03:22:40.519159000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/dox_cpmac.h  2005-07-12 02:48:42.050593000 +0200

 @@ -0,0 +1,842 @@
 +/*****************************************************************************
 + *  TNETDxxxx Software Support
 @@ -0,0 +1,842 @@
 +/*****************************************************************************
 + *  TNETDxxxx Software Support


@@ -8576,7 +8576,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/dox_cpmac.h linux.dev/drivers/ne
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/ec_errors_cpmac.h linux.dev/drivers/net/avalanche_cpmac/ec_errors_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/ec_errors_cpmac.h    1970-01-01 01:00:00.000000000 +0100
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/ec_errors_cpmac.h linux.dev/drivers/net/avalanche_cpmac/ec_errors_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/ec_errors_cpmac.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/ec_errors_cpmac.h    2005-07-10 03:22:40.519159000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/ec_errors_cpmac.h    2005-07-12 02:48:42.051592000 +0200

 @@ -0,0 +1,118 @@
 +/***************************************************************************
 + Copyright(c) 2001, Texas Instruments Incorporated. All Rights Reserved.
 @@ -0,0 +1,118 @@
 +/***************************************************************************
 + Copyright(c) 2001, Texas Instruments Incorporated. All Rights Reserved.


@@ -8698,7 +8698,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/ec_errors_cpmac.h linux.dev/driv
 +#endif /* _INC_EC_ERRORS */
 diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.c linux.dev/drivers/net/avalanche_cpmac/hcpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/hcpmac.c     1970-01-01 01:00:00.000000000 +0100
 +#endif /* _INC_EC_ERRORS */
 diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.c linux.dev/drivers/net/avalanche_cpmac/hcpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/hcpmac.c     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/hcpmac.c     2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/hcpmac.c     2005-07-12 02:48:42.174574000 +0200

 @@ -0,0 +1,1878 @@
 +/******************************************************************************
 + *  TNETDxxxx Software Support
 @@ -0,0 +1,1878 @@
 +/******************************************************************************
 + *  TNETDxxxx Software Support


@@ -10580,7 +10580,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.c linux.dev/drivers/net/a
 +}
 diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.h linux.dev/drivers/net/avalanche_cpmac/hcpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/hcpmac.h     1970-01-01 01:00:00.000000000 +0100
 +}
 diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.h linux.dev/drivers/net/avalanche_cpmac/hcpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/hcpmac.h     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/hcpmac.h     2005-07-10 03:22:40.522158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/hcpmac.h     2005-07-12 02:48:42.175574000 +0200

 @@ -0,0 +1,383 @@
 +/** @file***********************************************************************
 + *  TNETDxxxx Software Support
 @@ -0,0 +1,383 @@
 +/** @file***********************************************************************
 + *  TNETDxxxx Software Support


@@ -10967,7 +10967,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.h linux.dev/drivers/net/a
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/Makefile linux.dev/drivers/net/avalanche_cpmac/Makefile
 --- linux.old/drivers/net/avalanche_cpmac/Makefile     1970-01-01 01:00:00.000000000 +0100
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/Makefile linux.dev/drivers/net/avalanche_cpmac/Makefile
 --- linux.old/drivers/net/avalanche_cpmac/Makefile     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/Makefile     2005-07-10 03:22:40.522158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/Makefile     2005-07-12 02:48:42.175574000 +0200

 @@ -0,0 +1,26 @@
 +# File: drivers/net/avalanche_cpmac/Makefile
 +#
 @@ -0,0 +1,26 @@
 +# File: drivers/net/avalanche_cpmac/Makefile
 +#


@@ -10997,7 +10997,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/Makefile linux.dev/drivers/net/a
 +      rm -f core *.o *.a *.s
 diff -urN linux.old/drivers/net/avalanche_cpmac/mdio_reg.h linux.dev/drivers/net/avalanche_cpmac/mdio_reg.h
 --- linux.old/drivers/net/avalanche_cpmac/mdio_reg.h   1970-01-01 01:00:00.000000000 +0100
 +      rm -f core *.o *.a *.s
 diff -urN linux.old/drivers/net/avalanche_cpmac/mdio_reg.h linux.dev/drivers/net/avalanche_cpmac/mdio_reg.h
 --- linux.old/drivers/net/avalanche_cpmac/mdio_reg.h   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/mdio_reg.h   2005-07-10 03:22:40.522158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/mdio_reg.h   2005-07-12 02:48:42.176573000 +0200

 @@ -0,0 +1,121 @@
 +/****************************************************************************
 +**      TNETD53xx Software Support
 @@ -0,0 +1,121 @@
 +/****************************************************************************
 +**      TNETD53xx Software Support


@@ -11122,7 +11122,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/mdio_reg.h linux.dev/drivers/net
 +#endif _INC_MDIO_REG
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.c linux.dev/drivers/net/avalanche_cpmac/psp_config_build.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_build.c   1970-01-01 01:00:00.000000000 +0100
 +#endif _INC_MDIO_REG
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.c linux.dev/drivers/net/avalanche_cpmac/psp_config_build.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_build.c   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_build.c   2005-07-10 07:31:18.203326552 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_build.c   2005-07-12 02:48:42.176573000 +0200

 @@ -0,0 +1,335 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Configuration Build Source
 @@ -0,0 +1,335 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Configuration Build Source


@@ -11461,7 +11461,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.c linux.dev/dri
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.h linux.dev/drivers/net/avalanche_cpmac/psp_config_build.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_build.h   1970-01-01 01:00:00.000000000 +0100
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.h linux.dev/drivers/net/avalanche_cpmac/psp_config_build.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_build.h   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_build.h   2005-07-10 03:22:40.523158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_build.h   2005-07-12 02:48:42.176573000 +0200

 @@ -0,0 +1,138 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Configuration Build Header
 @@ -0,0 +1,138 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Configuration Build Header


@@ -11603,7 +11603,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.h linux.dev/dri
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.c linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.c     1970-01-01 01:00:00.000000000 +0100
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.c linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.c     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.c     2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.c     2005-07-12 02:48:42.177573000 +0200

 @@ -0,0 +1,464 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager Source
 @@ -0,0 +1,464 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager Source


@@ -12071,7 +12071,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.c linux.dev/drive
 +}                                                                               
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.h linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.h     1970-01-01 01:00:00.000000000 +0100
 +}                                                                               
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.h linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.h     1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.h     2005-07-10 03:22:40.525158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.h     2005-07-12 02:48:42.177573000 +0200

 @@ -0,0 +1,110 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager Header
 @@ -0,0 +1,110 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager Header


@@ -12185,7 +12185,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.h linux.dev/drive
 +#endif /* __PSP_CONFIG_MGR_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.c linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_parse.c   1970-01-01 01:00:00.000000000 +0100
 +#endif /* __PSP_CONFIG_MGR_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.c linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_parse.c   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.c   2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.c   2005-07-12 02:48:42.178573000 +0200

 @@ -0,0 +1,362 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Parse API Source
 @@ -0,0 +1,362 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Parse API Source


@@ -12551,7 +12551,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.c linux.dev/dri
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.h linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_parse.h   1970-01-01 01:00:00.000000000 +0100
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.h linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_parse.h   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.h   2005-07-10 03:22:40.526158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.h   2005-07-12 02:48:42.178573000 +0200

 @@ -0,0 +1,32 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Parse API Header
 @@ -0,0 +1,32 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Parse API Header


@@ -12587,7 +12587,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.h linux.dev/dri
 +#endif /* __PSP_CONFIG_PARSER_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.c linux.dev/drivers/net/avalanche_cpmac/psp_config_util.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_util.c    1970-01-01 01:00:00.000000000 +0100
 +#endif /* __PSP_CONFIG_PARSER_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.c linux.dev/drivers/net/avalanche_cpmac/psp_config_util.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_util.c    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_util.c    2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_util.c    2005-07-12 02:48:42.178573000 +0200

 @@ -0,0 +1,106 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Utilities API Source
 @@ -0,0 +1,106 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Utilities API Source


@@ -12697,7 +12697,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.c linux.dev/driv
 +#endif /* PSP_CONFIG_MGR_DEBUG_TEST */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.h linux.dev/drivers/net/avalanche_cpmac/psp_config_util.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_util.h    1970-01-01 01:00:00.000000000 +0100
 +#endif /* PSP_CONFIG_MGR_DEBUG_TEST */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.h linux.dev/drivers/net/avalanche_cpmac/psp_config_util.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_util.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_util.h    2005-07-10 03:22:40.526158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_util.h    2005-07-12 02:48:42.179573000 +0200

 @@ -0,0 +1,26 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Utilities API Header
 @@ -0,0 +1,26 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Utilities API Header


@@ -12727,7 +12727,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.h linux.dev/driv
 +#endif /* __PSP_CONFIG_UTIL_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/readme.txt linux.dev/drivers/net/avalanche_cpmac/readme.txt
 --- linux.old/drivers/net/avalanche_cpmac/readme.txt   1970-01-01 01:00:00.000000000 +0100
 +#endif /* __PSP_CONFIG_UTIL_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/readme.txt linux.dev/drivers/net/avalanche_cpmac/readme.txt
 --- linux.old/drivers/net/avalanche_cpmac/readme.txt   1970-01-01 01:00:00.000000000 +0100

-+++ linux.dev/drivers/net/avalanche_cpmac/readme.txt   2005-07-10 03:22:40.527158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/readme.txt   2005-07-12 02:48:42.179573000 +0200

 @@ -0,0 +1,545 @@
 +23 August 2004      CPMAC 1.7.8 (NSP Performance Team Release)
 +
 @@ -0,0 +1,545 @@
 +23 August 2004      CPMAC 1.7.8 (NSP Performance Team Release)
 +


@@ -13275,8 +13275,8 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/readme.txt linux.dev/drivers/net
 +RC2              9524                 32%
 +RC3             15190                 51%
 diff -urN linux.old/drivers/net/Config.in linux.dev/drivers/net/Config.in
 +RC2              9524                 32%
 +RC3             15190                 51%
 diff -urN linux.old/drivers/net/Config.in linux.dev/drivers/net/Config.in

---- linux.old/drivers/net/Config.in    2005-07-10 03:24:49.242590320 +0200
-+++ linux.dev/drivers/net/Config.in    2005-07-10 03:22:40.527158000 +0200
+--- linux.old/drivers/net/Config.in    2005-07-12 03:20:45.726149872 +0200
++++ linux.dev/drivers/net/Config.in    2005-07-12 02:48:42.180573000 +0200

 @@ -25,6 +25,24 @@
  comment 'Ethernet (10 or 100Mbit)'
  bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
 @@ -25,6 +25,24 @@
  comment 'Ethernet (10 or 100Mbit)'
  bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET


@@ -13303,8 +13303,8 @@ diff -urN linux.old/drivers/net/Config.in linux.dev/drivers/net/Config.in
        dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A $CONFIG_ARCH_EBSA110
        tristate '  Cirrus Logic CS8900A support' CONFIG_ARM_CIRRUS
 diff -urN linux.old/drivers/net/Makefile linux.dev/drivers/net/Makefile
        dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A $CONFIG_ARCH_EBSA110
        tristate '  Cirrus Logic CS8900A support' CONFIG_ARM_CIRRUS
 diff -urN linux.old/drivers/net/Makefile linux.dev/drivers/net/Makefile

---- linux.old/drivers/net/Makefile     2005-07-10 03:24:49.243590168 +0200
-+++ linux.dev/drivers/net/Makefile     2005-07-10 03:22:40.528157000 +0200
+--- linux.old/drivers/net/Makefile     2005-07-12 03:20:45.726149872 +0200
++++ linux.dev/drivers/net/Makefile     2005-07-12 02:48:42.181573000 +0200

 @@ -56,6 +56,16 @@
  subdir-$(CONFIG_BONDING) += bonding
  
 @@ -56,6 +56,16 @@
  subdir-$(CONFIG_BONDING) += bonding
  

diff --git a/target/linux/linux-2.4/patches/ar7/004-atm_driver.patch b/target/linux/linux-2.4/patches/ar7/004-atm_driver.patch
index 924b5c8..354517f 100644 (file)
--- a/target/linux/linux-2.4/patches/ar7/004-atm_driver.patch
+++ b/target/linux/linux-2.4/patches/ar7/004-atm_driver.patch
@@ -22187,7 +22187,7 @@ diff -urN linux.old/drivers/atm/sangam_atm/tn7atm.c linux.dev/drivers/atm/sangam
 +  /* Update Stats: There may be a better place to do this, but this is a start */
 +  priv->stats.tx_packets++;
 +#ifdef CONFIG_LED_MODULE
 +  /* Update Stats: There may be a better place to do this, but this is a start */
 +  priv->stats.tx_packets++;
 +#ifdef CONFIG_LED_MODULE

-+    led_operation(MOD_ADSL, DEF_ADSL_ACTIVITY);           
++//    led_operation(MOD_ADSL, DEF_ADSL_ACTIVITY);           

 +#endif
 +
 +  /* track number of buffer used */
 +#endif
 +
 +  /* track number of buffer used */


@@ -22283,7 +22283,7 @@ diff -urN linux.old/drivers/atm/sangam_atm/tn7atm.c linux.dev/drivers/atm/sangam
 +  atomic_inc(&vcc->stats->rx);
 +
 +#ifdef CONFIG_LED_MODULE
 +  atomic_inc(&vcc->stats->rx);
 +
 +#ifdef CONFIG_LED_MODULE

-+    led_operation(MOD_ADSL, DEF_ADSL_ACTIVITY);           
++//    led_operation(MOD_ADSL, DEF_ADSL_ACTIVITY);           

 +#endif
 +  dprintf(3, "(a) Receiving:vpi/vci[%d/%d] chan_id: %d  skb len:0x%x  skb truesize:0x%x\n",
 +                vcc->vpi,vcc->vci,ch,skb->len, skb->truesize);
 +#endif
 +  dprintf(3, "(a) Receiving:vpi/vci[%d/%d] chan_id: %d  skb len:0x%x  skb truesize:0x%x\n",
 +                vcc->vpi,vcc->vci,ch,skb->len, skb->truesize);


@@ -23611,7 +23611,7 @@ diff -urN linux.old/drivers/atm/sangam_atm/tn7dsl.c linux.dev/drivers/atm/sangam
 +        dslhal_api_initStatistics(pIhw);
 +        dslhal_api_gatherStatistics(pIhw);
 +#ifdef CONFIG_LED_MODULE
 +        dslhal_api_initStatistics(pIhw);
 +        dslhal_api_gatherStatistics(pIhw);
 +#ifdef CONFIG_LED_MODULE

-+        led_operation(MOD_ADSL, DEF_ADSL_SYNC);           
++//        led_operation(MOD_ADSL, DEF_ADSL_SYNC);           

 +        led_on = DEF_ADSL_SYNC;
 +#endif
 +        /* add auto margin retrain */
 +        led_on = DEF_ADSL_SYNC;
 +#endif
 +        /* add auto margin retrain */


@@ -23649,7 +23649,7 @@ diff -urN linux.old/drivers/atm/sangam_atm/tn7dsl.c linux.dev/drivers/atm/sangam
 +      {
 +        if(led_on != DEF_ADSL_IDLE)
 +        {
 +      {
 +        if(led_on != DEF_ADSL_IDLE)
 +        {

-+          led_operation(MOD_ADSL, DEF_ADSL_IDLE);           
++//          led_operation(MOD_ADSL, DEF_ADSL_IDLE);           

 +          led_on = DEF_ADSL_IDLE;
 +        }
 +      }
 +          led_on = DEF_ADSL_IDLE;
 +        }
 +      }


@@ -23657,7 +23657,7 @@ diff -urN linux.old/drivers/atm/sangam_atm/tn7dsl.c linux.dev/drivers/atm/sangam
 +      {
 +        if(led_on != DEF_ADSL_TRAINING)
 +        {
 +      {
 +        if(led_on != DEF_ADSL_TRAINING)
 +        {

-+          led_operation(MOD_ADSL, DEF_ADSL_TRAINING);           
++//          led_operation(MOD_ADSL, DEF_ADSL_TRAINING);           

 +          led_on = DEF_ADSL_TRAINING;
 +        }
 +
 +          led_on = DEF_ADSL_TRAINING;
 +        }
 +


@@ -23904,7 +23904,7 @@ diff -urN linux.old/drivers/atm/sangam_atm/tn7dsl.c linux.dev/drivers/atm/sangam
 +  deregister_led_drv(LED_NUM_1);
 +  deregister_led_drv(LED_NUM_2);
 +#else
 +  deregister_led_drv(LED_NUM_1);
 +  deregister_led_drv(LED_NUM_2);
 +#else

-+  led_operation(MOD_ADSL,DEF_ADSL_IDLE);
++//  led_operation(MOD_ADSL,DEF_ADSL_IDLE);

 +#endif
 +#endif
 +  stop_kthread(&overlay_thread);
 +#endif
 +#endif
 +  stop_kthread(&overlay_thread);