qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-19 03:53:10 +02:00
Code
650a72bd0d
openwrt-xburst/target/linux/linux-2.4/patches/ar7/000-ar7_support.patch
nbd 0cc08f7688 add pspboot support, cleanup in ar7 board support 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1611 3c298f89-4303-0410-b956-a3cf2f4a3e73
2005-08-12 13:59:13 +00:00

5835 lines
196 KiB
Diff
Raw Blame History

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-08-12 19:32:05.137225512 +0200
@@ -0,0 +1,64 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * Kernel command line creation using the prom monitor (YAMON) argc/argv.
+ */
+#include <linux/init.h>
+#include <linux/string.h>
+
+#include <asm/bootinfo.h>
+
+extern int prom_argc;
+extern int *_prom_argv;
+
+/*
+ * YAMON (32-bit PROM) pass arguments and environment as 32-bit pointer.
+ * This macro take care of sign extension.
+ */
+#define prom_argv(index) ((char *)(((int *)(int)_prom_argv)[(index)]))
+
+char arcs_cmdline[CL_SIZE];
+
+char * __init prom_getcmdline(void)
+{
+ return &(arcs_cmdline[0]);
+}
+
+
+void __init prom_init_cmdline(void)
+{
+ char *cp;
+ int actr;
+
+ actr = 1; /* Always ignore argv[0] */
+
+ cp = &(arcs_cmdline[0]);
+#ifdef CONFIG_CMDLINE_BOOL
+ strcpy(cp, CONFIG_CMDLINE);
+ cp += strlen(CONFIG_CMDLINE);
+ *cp++ = ' ';
+#endif
+ while(actr < prom_argc) {
+ strcpy(cp, prom_argv(actr));
+ cp += strlen(prom_argv(actr));
+ *cp++ = ' ';
+ actr++;
+ }
+ if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */
+ --cp;
+ *cp = '\0';
+}
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-08-12 19:34:07.215666768 +0200
@@ -0,0 +1,182 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * PROM library initialisation code.
+ */
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include <asm/io.h>
+#include <asm/mips-boards/prom.h>
+#include <asm/mips-boards/generic.h>
+
+/* Environment variable */
+typedef struct {
+ char *name;
+ char *val;
+} t_env_var;
+
+int prom_argc;
+int *_prom_argv, *_prom_envp;
+
+/* max # of Adam2 environment variables */
+#define MAX_ENV_ENTRY 80
+
+static t_env_var local_envp[MAX_ENV_ENTRY];
+static int env_type = 0;
+int init_debug = 0;
+
+unsigned int max_env_entry;
+
+extern char *prom_psp_getenv(char *envname);
+
+static inline char *prom_adam2_getenv(char *envname)
+{
+ /*
+ * Return a pointer to the given environment variable.
+ * In 64-bit mode: we're using 64-bit pointers, but all pointers
+ * in the PROM structures are only 32-bit, so we need some
+ * workarounds, if we are running in 64-bit mode.
+ */
+ int i;
+ t_env_var *env = (t_env_var *) local_envp;
+
+ if (strcmp("bootloader", envname) == 0)
+ return "Adam2";
+
+ i = strlen(envname);
+ while (env->name) {
+ if(strncmp(envname, env->name, i) == 0) {
+ return(env->val);
+ }
+ env++;
+ }
+
+ return NULL;
+}
+
+char *prom_getenv(char *envname)
+{
+ if (env_type == 1)
+ return prom_psp_getenv(envname);
+ else
+ return prom_adam2_getenv(envname);
+}
+
+static inline unsigned char str2hexnum(unsigned char c)
+{
+ if (c >= '0' && c <= '9')
+ return c - '0';
+ if (c >= 'a' && c <= 'f')
+ return c - 'a' + 10;
+ return 0; /* foo */
+}
+
+static inline void str2eaddr(unsigned char *ea, unsigned char *str)
+{
+ int i;
+
+ for (i = 0; i < 6; i++) {
+ unsigned char num;
+
+ if((*str == '.') || (*str == ':'))
+ str++;
+ num = str2hexnum(*str++) << 4;
+ num |= (str2hexnum(*str++));
+ ea[i] = num;
+ }
+}
+
+int get_ethernet_addr(char *ethernet_addr)
+{
+ char *ethaddr_str;
+
+ ethaddr_str = prom_getenv("ethaddr");
+ if (!ethaddr_str) {
+ printk("ethaddr not set in boot prom\n");
+ return -1;
+ }
+ str2eaddr(ethernet_addr, ethaddr_str);
+
+ if (init_debug > 1) {
+ int i;
+ printk("get_ethernet_addr: ");
+ for (i=0; i<5; i++)
+ printk("%02x:", (unsigned char)*(ethernet_addr+i));
+ printk("%02x\n", *(ethernet_addr+i));
+ }
+
+ return 0;
+}
+
+struct psbl_rec {
+ unsigned int psbl_size;
+ unsigned int env_base;
+ unsigned int env_size;
+ unsigned int ffs_base;
+ unsigned int ffs_size;
+};
+
+static const char psp_env_version[] = "TIENV0.8";
+
+int __init prom_init(int argc, char **argv, char **envp)
+{
+ int i;
+
+ t_env_var *env = (t_env_var *) envp;
+ struct psbl_rec *psbl = (struct psbl_rec *)(KSEG1ADDR(0x94000300));
+ void *psp_env = (void *)KSEG1ADDR(psbl->env_base);
+
+ prom_argc = argc;
+ _prom_argv = (int *)argv;
+ _prom_envp = (int *)envp;
+
+ if(strcmp(psp_env, psp_env_version) == 0) {
+ /* PSPBOOT */
+
+ env_type = 1;
+ _prom_envp = psp_env;
+ max_env_entry = (psbl->env_size / 16) - 1;
+ } else {
+ /* Copy what we need locally so we are not dependent on
+ * bootloader RAM. In Adam2, the environment parameters
+ * are in flash but the table that references them is in
+ * RAM
+ */
+
+ for(i=0; i < MAX_ENV_ENTRY; i++, env++) {
+ if (env->name) {
+ local_envp[i].name = env->name;
+ local_envp[i].val = env->val;
+ } else {
+ local_envp[i].name = NULL;
+ local_envp[i].val = NULL;
+ }
+ }
+ }
+
+ set_io_port_base(0);
+
+ prom_printf("\nLINUX started...\n");
+ prom_init_cmdline();
+ prom_meminit();
+
+ return 0;
+}
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-08-12 23:42:18.679820112 +0200
@@ -0,0 +1,709 @@
+/*
+ * Nitin Dhingra, iamnd@ti.com
+ * Copyright (C) 2002 Texas Instruments, Inc. All rights reserved.
+ *
+ * ########################################################################
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * ########################################################################
+ *
+ * Routines for generic manipulation of the interrupts found on the Texas
+ * Instruments avalanche board
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/kernel_stat.h>
+#include <linux/proc_fs.h>
+#include <asm/irq.h>
+#include <asm/mips-boards/prom.h>
+#include <asm/ar7/ar7.h>
+#include <asm/ar7/avalanche_intc.h>
+#include <asm/gdb-stub.h>
+
+
+#define shutdown_avalanche_irq disable_avalanche_irq
+#define mask_and_ack_avalanche_irq disable_avalanche_irq
+
+static unsigned int startup_avalanche_irq(unsigned int irq);
+static void end_avalanche_irq(unsigned int irq);
+void enable_avalanche_irq(unsigned int irq_nr);
+void disable_avalanche_irq(unsigned int irq_nr);
+
+static struct hw_interrupt_type avalanche_irq_type = {
+ "TI AVALANCHE",
+ startup_avalanche_irq,
+ shutdown_avalanche_irq,
+ enable_avalanche_irq,
+ disable_avalanche_irq,
+ mask_and_ack_avalanche_irq,
+ end_avalanche_irq,
+ NULL
+};
+
+irq_desc_t irq_desc_ti[AVALANCHE_INT_END+1] __cacheline_aligned =
+{ [0 ... AVALANCHE_INT_END] = { 0, &avalanche_irq_type, NULL, 0, SPIN_LOCK_UNLOCKED}};
+
+
+unsigned long spurious_count = 0;
+
+struct avalanche_ictrl_regs *avalanche_hw0_icregs; /* Interrupt control regs (primary) */
+struct avalanche_exctrl_regs *avalanche_hw0_ecregs; /* Exception control regs (secondary) */
+struct avalanche_ipace_regs *avalanche_hw0_ipaceregs;
+struct avalanche_channel_int_number *avalanche_hw0_chregs; /* Channel control registers */
+
+extern asmlinkage void mipsIRQ(void);
+
+
+/*
+ * The avalanche/MIPS interrupt line numbers are used to represent the
+ * interrupts within the irqaction arrays. The index notation is
+ * is as follows:
+ *
+ * 0-7 MIPS CPU Exceptions (HW/SW)
+ * 8-47 Primary Interrupts (Avalanche)
+ * 48-79 Secondary Interrupts (Avalanche)
+ *
+ */
+
+
+static struct irqaction *hw0_irq_action_primary[AVINTNUM(AVALANCHE_INT_END_PRIMARY)] =
+{
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL
+};
+
+static struct irqaction *hw0_irq_action_secondary[AVINTNUM(AVALANCHE_INT_END_SECONDARY)] =
+{
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL
+};
+
+/*
+ This remaps interrupts to exist on other channels than the default
+ channels. essentially we can use the line # as the index for this
+ array
+ */
+
+
+static unsigned long line_to_channel[AVINTNUM(AVALANCHE_INT_END_PRIMARY)];
+unsigned long uni_secondary_interrupt = 0;
+
+static struct irqaction r4ktimer_action = {
+ NULL, 0, 0, "R4000 timer/counter", NULL, NULL,
+};
+
+static struct irqaction *irq_action[8] = {
+ NULL, /* SW int 0 */
+ NULL, /* SW int 1 */
+ NULL, /* HW int 0 */
+ NULL,
+ NULL,
+ NULL, /* HW int 3 */
+ NULL, /* HW int 4 */
+ &r4ktimer_action /* HW int 5 */
+};
+
+static void end_avalanche_irq(unsigned int irq)
+{
+ if (!(irq_desc_ti[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+ enable_avalanche_irq(irq);
+}
+
+void disable_avalanche_irq(unsigned int irq_nr)
+{
+ unsigned long flags;
+ unsigned long chan_nr=0;
+ unsigned long int_bit=0;
+
+ if(irq_nr >= AVALANCHE_INT_END)
+ {
+ printk("whee, invalid irq_nr %d\n", irq_nr);
+ panic("IRQ, you lose...");
+ }
+
+ save_and_cli(flags);
+
+
+ if(irq_nr < MIPS_EXCEPTION_OFFSET)
+ {
+ /* disable mips exception */
+
+ int_bit = read_c0_status() & ~(1 << (8+irq_nr));
+ change_c0_status(ST0_IM,int_bit);
+ restore_flags(flags);
+ return;
+ }
+
+ /* irq_nr represents the line number for the interrupt. We must
+ * disable the channel number associated with that line number.
+ */
+
+ if(irq_nr > AVALANCHE_INT_END_PRIMARY_REG2)
+ chan_nr = AVINTNUM(irq_nr); /*CHECK THIS ALSO*/
+ else
+ chan_nr = line_to_channel[AVINTNUM(irq_nr)];/* WE NEED A LINE TO CHANNEL MAPPING FUNCTION HERE*/
+
+ /* disable the interrupt channel bit */
+
+ /* primary interrupt #'s 0-31 */
+
+ if(chan_nr <= AVINTNUM(AVALANCHE_INT_END_PRIMARY_REG1))
+ avalanche_hw0_icregs->intecr1 = (1 << chan_nr);
+
+ /* primary interrupt #'s 32-39 */
+
+ else if ((chan_nr <= AVINTNUM(AVALANCHE_INT_END_PRIMARY_REG2)) &&
+ (chan_nr > AVINTNUM(AVALANCHE_INT_END_PRIMARY_REG1)))
+ avalanche_hw0_icregs->intecr2 = (1 << (chan_nr - AVINTNUM(AVALANCHE_INT_END_SECONDARY)));
+
+ else /* secondary interrupt #'s 0-31 */
+ avalanche_hw0_ecregs->exiecr = (1 << (chan_nr - AVINTNUM(AVALANCHE_INT_END_PRIMARY)));
+
+ restore_flags(flags);
+}
+
+void enable_avalanche_irq(unsigned int irq_nr)
+{
+ unsigned long flags;
+ unsigned long chan_nr=0;
+ unsigned long int_bit=0;
+
+ if(irq_nr > AVALANCHE_INT_END) {
+ printk("whee, invalid irq_nr %d\n", irq_nr);
+ panic("IRQ, you lose...");
+ }
+
+ save_and_cli(flags);
+
+
+ if(irq_nr < MIPS_EXCEPTION_OFFSET)
+ {
+ /* Enable MIPS exceptions */
+ int_bit = read_c0_status();
+ change_c0_status(ST0_IM,int_bit | (1<<(8+irq_nr)));
+ restore_flags(flags);
+ return;
+ }
+
+ /* irq_nr represents the line number for the interrupt. We must
+ * disable the channel number associated with that line number.
+ */
+
+ if(irq_nr > AVALANCHE_INT_END_PRIMARY_REG2)
+ chan_nr = AVINTNUM(irq_nr);
+ else
+ chan_nr = line_to_channel[AVINTNUM(irq_nr)];
+
+ /* enable the interrupt channel bit */
+
+ /* primary interrupt #'s 0-31 */
+ if(chan_nr <= AVINTNUM(AVALANCHE_INT_END_PRIMARY_REG1))
+ avalanche_hw0_icregs->intesr1 = (1 << chan_nr);
+
+ /* primary interrupt #'s 32 throuth 39 */
+ else if ((chan_nr <= AVINTNUM(AVALANCHE_INT_END_PRIMARY_REG2)) &&
+ (chan_nr > AVINTNUM(AVALANCHE_INT_END_PRIMARY_REG1)))
+ avalanche_hw0_icregs->intesr2 = (1 << (chan_nr - AVINTNUM(AVALANCHE_INT_END_SECONDARY)));
+
+ else /* secondary interrupt #'s 0-31 */
+ avalanche_hw0_ecregs->exiesr = (1 << (chan_nr - AVINTNUM(AVALANCHE_INT_END_PRIMARY)));
+
+ restore_flags(flags);
+}
+
+static unsigned int startup_avalanche_irq(unsigned int irq)
+{
+ enable_avalanche_irq(irq);
+ return 0; /* never anything pending */
+}
+
+
+int get_irq_list(char *buf)
+{
+ int i, len = 0;
+ int num = 0;
+ struct irqaction *action;
+
+ for (i = 0; i < MIPS_EXCEPTION_OFFSET; i++, num++)
+ {
+ action = irq_action[i];
+ if (!action)
+ continue;
+ len += sprintf(buf+len, "%2d: %8d %c %s",
+ num, kstat.irqs[0][num],
+ (action->flags & SA_INTERRUPT) ? '+' : ' ',
+ action->name);
+ for (action=action->next; action; action = action->next) {
+ len += sprintf(buf+len, ",%s %s",
+ (action->flags & SA_INTERRUPT) ? " +" : "",
+ action->name);
+ }
+ len += sprintf(buf+len, " [MIPS interrupt]\n");
+ }
+
+
+ for (i = 0; i < AVINTNUM(AVALANCHE_INT_END); i++,num++)
+ {
+ if(i < AVINTNUM(AVALANCHE_INT_END_PRIMARY))
+ action = hw0_irq_action_primary[i];
+ else
+ action = hw0_irq_action_secondary[i-AVINTNUM(AVALANCHE_INT_END_PRIMARY)];
+ if (!action)
+ continue;
+ len += sprintf(buf+len, "%2d: %8d %c %s",
+ num, kstat.irqs[0][ LNXINTNUM(i) ],
+ (action->flags & SA_INTERRUPT) ? '+' : ' ',
+ action->name);
+
+ for (action=action->next; action; action = action->next)
+ {
+ len += sprintf(buf+len, ",%s %s",
+ (action->flags & SA_INTERRUPT) ? " +" : "",
+ action->name);
+ }
+
+ if(i < AVINTNUM(AVALANCHE_INT_END_PRIMARY))
+ len += sprintf(buf+len, " [hw0 (Avalanche Primary)]\n");
+ else
+ len += sprintf(buf+len, " [hw0 (Avalanche Secondary)]\n");
+
+ }
+
+ return len;
+}
+
+int request_irq(unsigned int irq,
+ void (*handler)(int, void *, struct pt_regs *),
+ unsigned long irqflags,
+ const char * devname,
+ void *dev_id)
+{
+ struct irqaction *action;
+
+ if (irq > AVALANCHE_INT_END)
+ return -EINVAL;
+ if (!handler)
+ return -EINVAL;
+
+ action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);
+ if(!action)
+ return -ENOMEM;
+
+ action->handler = handler;
+ action->flags = irqflags;
+ action->mask = 0;
+ action->name = devname;
+ irq_desc_ti[irq].action = action;
+ action->dev_id = dev_id;
+
+ action->next = 0;
+
+ if(irq < MIPS_EXCEPTION_OFFSET)
+ {
+ irq_action[irq] = action;
+ enable_avalanche_irq(irq);
+ return 0;
+ }
+
+ if(irq < AVALANCHE_INT_END_PRIMARY)
+ hw0_irq_action_primary[line_to_channel[AVINTNUM(irq)]] = action;
+ else
+ hw0_irq_action_secondary[irq - AVALANCHE_INT_END_PRIMARY] = action;
+
+ enable_avalanche_irq(irq);
+
+ return 0;
+}
+
+void free_irq(unsigned int irq, void *dev_id)
+{
+ struct irqaction *action;
+
+ if (irq > AVALANCHE_INT_END) {
+ printk("Trying to free IRQ%d\n",irq);
+ return;
+ }
+
+ if(irq < MIPS_EXCEPTION_OFFSET)
+ {
+ action = irq_action[irq];
+ irq_action[irq] = NULL;
+ irq_desc_ti[irq].action = NULL;
+ disable_avalanche_irq(irq);
+ kfree(action);
+ return;
+ }
+
+ if(irq < AVALANCHE_INT_END_PRIMARY) {
+ action = hw0_irq_action_primary[line_to_channel[AVINTNUM(irq)]];
+ hw0_irq_action_primary[line_to_channel[AVINTNUM(irq)]] = NULL;
+ irq_desc_ti[irq].action = NULL;
+ }
+ else {
+ action = hw0_irq_action_secondary[irq - AVALANCHE_INT_END_PRIMARY];
+ hw0_irq_action_secondary[irq - AVALANCHE_INT_END_PRIMARY] = NULL;
+ irq_desc_ti[irq].action = NULL;
+ }
+
+ disable_avalanche_irq(irq);
+ kfree(action);
+}
+
+#ifdef CONFIG_KGDB
+extern void breakpoint(void);
+extern int remote_debug;
+#endif
+
+
+//void init_IRQ(void) __init;
+void __init init_IRQ(void)
+{
+ int i;
+
+ avalanche_hw0_icregs = (struct avalanche_ictrl_regs *)AVALANCHE_ICTRL_REGS_BASE;
+ avalanche_hw0_ecregs = (struct avalanche_exctrl_regs *)AVALANCHE_ECTRL_REGS_BASE;
+ avalanche_hw0_ipaceregs = (struct avalanche_ipace_regs *)AVALANCHE_IPACE_REGS_BASE;
+ avalanche_hw0_chregs = (struct avalanche_channel_int_number *)AVALANCHE_CHCTRL_REGS_BASE;
+
+ /* Disable interrupts and clear pending
+ */
+
+ avalanche_hw0_icregs->intecr1 = 0xffffffff; /* disable interrupts 0:31 */
+ avalanche_hw0_icregs->intcr1 = 0xffffffff; /* clear interrupts 0:31 */
+ avalanche_hw0_icregs->intecr2 = 0xff; /* disable interrupts 32:39 */
+ avalanche_hw0_icregs->intcr2 = 0xff; /* clear interrupts 32:39 */
+ avalanche_hw0_ecregs->exiecr = 0xffffffff; /* disable secondary interrupts 0:31 */
+ avalanche_hw0_ecregs->excr = 0xffffffff; /* clear secondary interrupts 0:31 */
+
+
+ // avalanche_hw0_ipaceregs->ipacep = (2*get_avalanche_vbus_freq()/1000000)*4;
+ /* hack for speeding up the pacing. */
+ printk("the pacing pre-scalar has been set as 600.\n");
+ avalanche_hw0_ipaceregs->ipacep = 600;
+ /* Channel to line mapping, Line to Channel mapping */
+
+ for(i = 0; i < 40; i++)
+ avalanche_int_set(i,i);
+
+ /* Now safe to set the exception vector. */
+ set_except_vector(0, mipsIRQ);
+
+ /* Setup the IRQ description array. These will be mapped
+ * as flat interrupts numbers. The mapping is as follows
+ *
+ * 0-7 MIPS CPU Exceptions (HW/SW)
+ * 8-46 Primary Interrupts (Avalanche)
+ * 47-78 Secondary Interrupts (Avalanche)
+ */
+
+ for (i = 0; i <= AVALANCHE_INT_END; i++)
+ {
+ irq_desc_ti[i].status = IRQ_DISABLED;
+ irq_desc_ti[i].action = 0;
+ irq_desc_ti[i].depth = 1;
+ irq_desc_ti[i].handler = &avalanche_irq_type;
+ }
+
+#ifdef CONFIG_KGDB
+ if (remote_debug)
+ {
+ set_debug_traps();
+ breakpoint();
+ }
+#endif
+}
+
+void avalanche_hw0_irqdispatch(struct pt_regs *regs)
+{
+ struct irqaction *action;
+ int irq, cpu = smp_processor_id();
+ unsigned long int_line_number,status;
+ int i,secondary = 0;
+ int chan_nr=0;
+
+ int_line_number = ((avalanche_hw0_icregs->pintir >> 16) & 0x3F);
+ chan_nr = ((avalanche_hw0_icregs->pintir) & 0x3F);
+
+
+ if(chan_nr < 32)
+ {
+ if( chan_nr != uni_secondary_interrupt)
+ avalanche_hw0_icregs->intcr1 = (1<<chan_nr);
+
+ }
+
+ if((chan_nr < 40) && (chan_nr > 31))
+ {
+ avalanche_hw0_icregs->intcr2 = (1<<(chan_nr-AVINTNUM(AVALANCHE_INT_END_SECONDARY)));
+ }
+
+
+ /* If the Priority Interrupt Index Register returns 40 then no
+ * interrupts are pending
+ */
+
+ if(chan_nr == 40)
+ return;
+
+ if(chan_nr == uni_secondary_interrupt)
+ {
+ status = avalanche_hw0_ecregs->exsr;
+ for(i=0; i < AVINTNUM(AVALANCHE_INT_END_SECONDARY); i++)
+ {
+ if (status & 1<<i)
+ {
+ /* clear secondary interrupt */
+ avalanche_hw0_ecregs->excr = 1 << i;
+ break;
+ }
+ }
+ irq = i;
+ secondary = 1;
+
+ /* clear the universal secondary interrupt */
+ avalanche_hw0_icregs->intcr1 = 1 << uni_secondary_interrupt;
+
+ }
+ else
+ irq = chan_nr;
+
+ /* Suraj Add code to clear secondary interrupt */
+
+ if(secondary)
+ action = hw0_irq_action_secondary[irq];
+ else
+ action = hw0_irq_action_primary[irq];
+
+ /* if action == NULL, then we don't have a handler for the irq */
+
+ if ( action == NULL ) {
+ printk("No handler for hw0 irq: %i\n", irq);
+ return;
+ }
+
+ irq_enter(cpu,irq);
+ if(secondary)
+ {
+ kstat.irqs[0][(irq + AVINTNUM(AVALANCHE_INT_END_PRIMARY)) + 8]++;
+ action->handler((irq + AVALANCHE_INT_END_PRIMARY), action->dev_id, regs);
+ }
+ else
+ {
+ kstat.irqs[0][irq + 8]++;
+ action->handler(LNXINTNUM(irq), action->dev_id, regs);
+ }
+
+ irq_exit(cpu,irq);
+
+ if(softirq_pending(cpu))
+ do_softirq();
+
+ return;
+}
+
+void avalanche_int_set(int channel, int line)
+{
+ switch(channel)
+ {
+ case(0):
+ avalanche_hw0_chregs->cintnr0 = line;
+ break;
+ case(1):
+ avalanche_hw0_chregs->cintnr1 = line;
+ break;
+ case(2):
+ avalanche_hw0_chregs->cintnr2 = line;
+ break;
+ case(3):
+ avalanche_hw0_chregs->cintnr3 = line;
+ break;
+ case(4):
+ avalanche_hw0_chregs->cintnr4 = line;
+ break;
+ case(5):
+ avalanche_hw0_chregs->cintnr5 = line;
+ break;
+ case(6):
+ avalanche_hw0_chregs->cintnr6 = line;
+ break;
+ case(7):
+ avalanche_hw0_chregs->cintnr7 = line;
+ break;
+ case(8):
+ avalanche_hw0_chregs->cintnr8 = line;
+ break;
+ case(9):
+ avalanche_hw0_chregs->cintnr9 = line;
+ break;
+ case(10):
+ avalanche_hw0_chregs->cintnr10 = line;
+ break;
+ case(11):
+ avalanche_hw0_chregs->cintnr11 = line;
+ break;
+ case(12):
+ avalanche_hw0_chregs->cintnr12 = line;
+ break;
+ case(13):
+ avalanche_hw0_chregs->cintnr13 = line;
+ break;
+ case(14):
+ avalanche_hw0_chregs->cintnr14 = line;
+ break;
+ case(15):
+ avalanche_hw0_chregs->cintnr15 = line;
+ break;
+ case(16):
+ avalanche_hw0_chregs->cintnr16 = line;
+ break;
+ case(17):
+ avalanche_hw0_chregs->cintnr17 = line;
+ break;
+ case(18):
+ avalanche_hw0_chregs->cintnr18 = line;
+ break;
+ case(19):
+ avalanche_hw0_chregs->cintnr19 = line;
+ break;
+ case(20):
+ avalanche_hw0_chregs->cintnr20 = line;
+ break;
+ case(21):
+ avalanche_hw0_chregs->cintnr21 = line;
+ break;
+ case(22):
+ avalanche_hw0_chregs->cintnr22 = line;
+ break;
+ case(23):
+ avalanche_hw0_chregs->cintnr23 = line;
+ break;
+ case(24):
+ avalanche_hw0_chregs->cintnr24 = line;
+ break;
+ case(25):
+ avalanche_hw0_chregs->cintnr25 = line;
+ break;
+ case(26):
+ avalanche_hw0_chregs->cintnr26 = line;
+ break;
+ case(27):
+ avalanche_hw0_chregs->cintnr27 = line;
+ break;
+ case(28):
+ avalanche_hw0_chregs->cintnr28 = line;
+ break;
+ case(29):
+ avalanche_hw0_chregs->cintnr29 = line;
+ break;
+ case(30):
+ avalanche_hw0_chregs->cintnr30 = line;
+ break;
+ case(31):
+ avalanche_hw0_chregs->cintnr31 = line;
+ break;
+ case(32):
+ avalanche_hw0_chregs->cintnr32 = line;
+ break;
+ case(33):
+ avalanche_hw0_chregs->cintnr33 = line;
+ break;
+ case(34):
+ avalanche_hw0_chregs->cintnr34 = line;
+ break;
+ case(35):
+ avalanche_hw0_chregs->cintnr35 = line;
+ break;
+ case(36):
+ avalanche_hw0_chregs->cintnr36 = line;
+ break;
+ case(37):
+ avalanche_hw0_chregs->cintnr37 = line;
+ break;
+ case(38):
+ avalanche_hw0_chregs->cintnr38 = line;
+ break;
+ case(39):
+ avalanche_hw0_chregs->cintnr39 = line;
+ break;
+ default:
+ printk("Error: Unknown Avalanche interrupt channel\n");
+ }
+
+ line_to_channel[line] = channel; /* Suraj check */
+
+ if (channel == UNIFIED_SECONDARY_INTERRUPT)
+ uni_secondary_interrupt = line;
+
+}
+
+
+#define AVALANCHE_MAX_PACING_BLK 3
+#define AVALANCHE_PACING_LOW_VAL 2
+#define AVALANCHE_PACING_HIGH_VAL 63
+
+int avalanche_request_pacing(int irq_nr, unsigned int blk_num,
+ unsigned int pace_value)
+{
+ unsigned int blk_offset;
+ unsigned long flags;
+
+ if(irq_nr < MIPS_EXCEPTION_OFFSET &&
+ irq_nr >= AVALANCHE_INT_END_PRIMARY)
+ return (0);
+
+ if(blk_num > AVALANCHE_MAX_PACING_BLK)
+ return(-1);
+
+ if(pace_value > AVALANCHE_PACING_HIGH_VAL &&
+ pace_value < AVALANCHE_PACING_LOW_VAL)
+ return(-1);
+
+ blk_offset = blk_num*8;
+
+ save_and_cli(flags);
+
+ /* disable the interrupt pacing, if enabled previously */
+ avalanche_hw0_ipaceregs->ipacemax &= ~(0xff << blk_offset);
+
+ /* clear the pacing map */
+ avalanche_hw0_ipaceregs->ipacemap &= ~(0xff << blk_offset);
+
+ /* setup the new values */
+ avalanche_hw0_ipaceregs->ipacemap |= ((AVINTNUM(irq_nr)) << blk_offset);
+ avalanche_hw0_ipaceregs->ipacemax |= ((0x80 | pace_value) << blk_offset);
+
+ restore_flags(flags);
+
+ return(0);
+}
diff -urN linux.old/arch/mips/ar7/Makefile linux.dev/arch/mips/ar7/Makefile
--- linux.old/arch/mips/ar7/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/arch/mips/ar7/Makefile 2005-08-12 21:21:30.425150040 +0200
@@ -0,0 +1,14 @@
+.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
+
+obj-y := tnetd73xx_misc.o misc.o
+export-objs := misc.o
+obj-y += setup.o irq.o mipsIRQ.o reset.o init.o psp_env.o memory.o printf.o cmdline.o time.o
+
+include $(TOPDIR)/Rules.make
diff -urN linux.old/arch/mips/ar7/memory.c linux.dev/arch/mips/ar7/memory.c
--- linux.old/arch/mips/ar7/memory.c 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/arch/mips/ar7/memory.c 2005-08-12 19:52:25.301732312 +0200
@@ -0,0 +1,131 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
+ *
+ * ########################################################################
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * ########################################################################
+ *
+ * PROM library functions for acquiring/using memory descriptors given to
+ * us from the YAMON.
+ *
+ */
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/bootmem.h>
+
+#include <asm/bootinfo.h>
+#include <asm/page.h>
+#include <asm/mips-boards/prom.h>
+
+enum yamon_memtypes {
+ yamon_dontuse,
+ yamon_prom,
+ yamon_free,
+};
+struct prom_pmemblock mdesc[PROM_MAX_PMEMBLOCKS];
+
+/* References to section boundaries */
+extern char _end;
+
+#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
+
+
+struct prom_pmemblock * __init prom_getmdesc(void)
+{
+ char *memsize_str;
+ unsigned int memsize;
+
+ memsize_str = prom_getenv("memsize");
+ if (!memsize_str) {
+ memsize = 0x02000000;
+ } else {
+ memsize = simple_strtol(memsize_str, NULL, 0);
+ }
+
+ memset(mdesc, 0, sizeof(mdesc));
+
+ mdesc[0].type = yamon_dontuse;
+ mdesc[0].base = 0x00000000;
+ mdesc[0].size = CONFIG_AR7_MEMORY;
+
+ mdesc[1].type = yamon_prom;
+ mdesc[1].base = CONFIG_AR7_MEMORY;
+ mdesc[1].size = 0x00020000;
+
+ mdesc[2].type = yamon_free;
+ mdesc[2].base = CONFIG_AR7_MEMORY + 0x00020000;
+ mdesc[2].size = (memsize + CONFIG_AR7_MEMORY) - mdesc[2].base;
+
+ return &mdesc[0];
+}
+
+static int __init prom_memtype_classify (unsigned int type)
+{
+ switch (type) {
+ case yamon_free:
+ return BOOT_MEM_RAM;
+ case yamon_prom:
+ return BOOT_MEM_ROM_DATA;
+ default:
+ return BOOT_MEM_RESERVED;
+ }
+}
+
+void __init prom_meminit(void)
+{
+ struct prom_pmemblock *p;
+
+ p = prom_getmdesc();
+
+ while (p->size) {
+ long type;
+ unsigned long base, size;
+
+ type = prom_memtype_classify (p->type);
+ base = p->base;
+ size = p->size;
+
+ add_memory_region(base, size, type);
+ p++;
+ }
+}
+
+void __init prom_free_prom_memory (void)
+{
+#if 0
+ int i;
+ unsigned long freed = 0;
+ unsigned long addr;
+
+ for (i = 0; i < boot_mem_map.nr_map; i++) {
+ if (boot_mem_map.map[i].type != BOOT_MEM_ROM_DATA)
+ continue;
+
+ addr = boot_mem_map.map[i].addr;
+ while (addr < boot_mem_map.map[i].addr
+ + boot_mem_map.map[i].size) {
+ ClearPageReserved(virt_to_page(__va(addr)));
+ set_page_count(virt_to_page(__va(addr)), 1);
+ free_page((unsigned long)__va(addr));
+ addr += PAGE_SIZE;
+ freed += PAGE_SIZE;
+ }
+ }
+ printk("Freeing prom memory: %ldkb freed\n", freed >> 10);
+#endif
+}
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-08-12 19:32:05.138225360 +0200
@@ -0,0 +1,120 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999, 2000 MIPS Technologies, Inc. All rights reserved.
+ *
+ * ########################################################################
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * ########################################################################
+ *
+ * Interrupt exception dispatch code.
+ *
+ */
+#include <linux/config.h>
+
+#include <asm/asm.h>
+#include <asm/mipsregs.h>
+#include <asm/regdef.h>
+#include <asm/stackframe.h>
+
+/* A lot of complication here is taken away because:
+ *
+ * 1) We handle one interrupt and return, sitting in a loop and moving across
+ * all the pending IRQ bits in the cause register is _NOT_ the answer, the
+ * common case is one pending IRQ so optimize in that direction.
+ *
+ * 2) We need not check against bits in the status register IRQ mask, that
+ * would make this routine slow as hell.
+ *
+ * 3) Linux only thinks in terms of all IRQs on or all IRQs off, nothing in
+ * between like BSD spl() brain-damage.
+ *
+ * Furthermore, the IRQs on the MIPS board look basically (barring software
+ * IRQs which we don't use at all and all external interrupt sources are
+ * combined together on hardware interrupt 0 (MIPS IRQ 2)) like:
+ *
+ * MIPS IRQ Source
+ * -------- ------
+ * 0 Software (ignored)
+ * 1 Software (ignored)
+ * 2 Combined hardware interrupt (hw0)
+ * 3 Hardware (ignored)
+ * 4 Hardware (ignored)
+ * 5 Hardware (ignored)
+ * 6 Hardware (ignored)
+ * 7 R4k timer (what we use)
+ *
+ * Note: On the SEAD board thing are a little bit different.
+ * Here IRQ 2 (hw0) is wired to the UART0 and IRQ 3 (hw1) is wired
+ * wired to UART1.
+ *
+ * We handle the IRQ according to _our_ priority which is:
+ *
+ * Highest ---- R4k Timer
+ * Lowest ---- Combined hardware interrupt
+ *
+ * then we just return, if multiple IRQs are pending then we will just take
+ * another exception, big deal.
+ */
+
+.text
+.set noreorder
+.set noat
+ .align 5
+NESTED(mipsIRQ, PT_SIZE, sp)
+ SAVE_ALL
+ CLI
+ .set at
+
+ mfc0 s0, CP0_CAUSE # get irq bits
+
+ /* First we check for r4k counter/timer IRQ. */
+ andi a0, s0, CAUSEF_IP7
+ beq a0, zero, 1f
+ andi a0, s0, CAUSEF_IP2 # delay slot, check hw0 interrupt
+
+ /* Wheee, a timer interrupt. */
+ move a0, sp
+ jal ar7_timer_interrupt
+ nop
+
+ j ret_from_irq
+ nop
+
+ 1:
+ beq a0, zero, 1f # delay slot, check hw3 interrupt
+ nop
+
+ /* Wheee, combined hardware level zero interrupt. */
+ jal avalanche_hw0_irqdispatch
+ move a0, sp # delay slot
+
+ j ret_from_irq
+ nop # delay slot
+
+ 1:
+ /*
+ * Here by mistake? This is possible, what can happen is that by the
+ * time we take the exception the IRQ pin goes low, so just leave if
+ * this is the case.
+ */
+ move a1,s0
+ PRINT("Got interrupt: c0_cause = %08x\n")
+ mfc0 a1, CP0_EPC
+ PRINT("c0_epc = %08x\n")
+
+ j ret_from_irq
+ nop
+END(mipsIRQ)
diff -urN linux.old/arch/mips/ar7/misc.c linux.dev/arch/mips/ar7/misc.c
--- linux.old/arch/mips/ar7/misc.c 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/arch/mips/ar7/misc.c 2005-08-12 19:32:05.136225664 +0200
@@ -0,0 +1,319 @@
+#include <asm/ar7/sangam.h>
+#include <asm/ar7/avalanche_misc.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+
+#define TRUE 1
+
+static unsigned int avalanche_vbus_freq;
+
+REMOTE_VLYNQ_DEV_RESET_CTRL_FN p_remote_vlynq_dev_reset_ctrl = NULL;
+
+/*****************************************************************************
+ * Reset Control Module.
+ *****************************************************************************/
+void avalanche_reset_ctrl(unsigned int module_reset_bit,
+ AVALANCHE_RESET_CTRL_T reset_ctrl)
+{
+ volatile unsigned int *reset_reg = (unsigned int*) AVALANCHE_RST_CTRL_PRCR;
+
+ if(module_reset_bit >= 32 && module_reset_bit < 64)
+ return;
+
+ if(module_reset_bit >= 64)
+ {
+ if(p_remote_vlynq_dev_reset_ctrl)
+ return(p_remote_vlynq_dev_reset_ctrl(module_reset_bit - 64, reset_ctrl));
+ else
+ return;
+ }
+
+ if(reset_ctrl == OUT_OF_RESET)
+ *reset_reg |= 1 << module_reset_bit;
+ else
+ *reset_reg &= ~(1 << module_reset_bit);
+}
+
+AVALANCHE_RESET_CTRL_T avalanche_get_reset_status(unsigned int module_reset_bit)
+{
+ volatile unsigned int *reset_reg = (unsigned int*) AVALANCHE_RST_CTRL_PRCR;
+
+ return (((*reset_reg) & (1 << module_reset_bit)) ? OUT_OF_RESET : IN_RESET );
+}
+
+void avalanche_sys_reset(AVALANCHE_SYS_RST_MODE_T mode)
+{
+ volatile unsigned int *sw_reset_reg = (unsigned int*) AVALANCHE_RST_CTRL_SWRCR;
+ *sw_reset_reg = mode;
+}
+
+#define AVALANCHE_RST_CTRL_RSR_MASK 0x3
+
+AVALANCHE_SYS_RESET_STATUS_T avalanche_get_sys_last_reset_status()
+{
+ volatile unsigned int *sys_reset_status = (unsigned int*) AVALANCHE_RST_CTRL_RSR;
+
+ return ( (AVALANCHE_SYS_RESET_STATUS_T) (*sys_reset_status & AVALANCHE_RST_CTRL_RSR_MASK) );
+}
+
+
+/*****************************************************************************
+ * Power Control Module
+ *****************************************************************************/
+#define AVALANCHE_GLOBAL_POWER_DOWN_MASK 0x3FFFFFFF /* bit 31, 30 masked */
+#define AVALANCHE_GLOBAL_POWER_DOWN_BIT 30 /* shift to bit 30, 31 */
+
+
+void avalanche_power_ctrl(unsigned int module_power_bit, AVALANCHE_POWER_CTRL_T power_ctrl)
+{
+ volatile unsigned int *power_reg = (unsigned int*)AVALANCHE_POWER_CTRL_PDCR;
+
+ if (power_ctrl == POWER_CTRL_POWER_DOWN)
+ /* power down the module */
+ *power_reg |= (1 << module_power_bit);
+ else
+ /* power on the module */
+ *power_reg &= (~(1 << module_power_bit));
+}
+
+AVALANCHE_POWER_CTRL_T avalanche_get_power_status(unsigned int module_power_bit)
+{
+ volatile unsigned int *power_status_reg = (unsigned int*)AVALANCHE_POWER_CTRL_PDCR;
+
+ return (((*power_status_reg) & (1 << module_power_bit)) ? POWER_CTRL_POWER_DOWN : POWER_CTRL_POWER_UP);
+}
+
+void avalanche_set_global_power_mode(AVALANCHE_SYS_POWER_MODE_T power_mode)
+{
+ volatile unsigned int *power_status_reg = (unsigned int*)AVALANCHE_POWER_CTRL_PDCR;
+
+ *power_status_reg &= AVALANCHE_GLOBAL_POWER_DOWN_MASK;
+ *power_status_reg |= ( power_mode << AVALANCHE_GLOBAL_POWER_DOWN_BIT);
+}
+
+AVALANCHE_SYS_POWER_MODE_T avalanche_get_global_power_mode(void)
+{
+ volatile unsigned int *power_status_reg = (unsigned int*)AVALANCHE_POWER_CTRL_PDCR;
+
+ return((AVALANCHE_SYS_POWER_MODE_T) (((*power_status_reg) & (~AVALANCHE_GLOBAL_POWER_DOWN_MASK))
+ >> AVALANCHE_GLOBAL_POWER_DOWN_BIT));
+}
+
+/*****************************************************************************
+ * GPIO Control
+ *****************************************************************************/
+
+/****************************************************************************
+ * FUNCTION: avalanche_gpio_init
+ ***************************************************************************/
+void avalanche_gpio_init(void)
+{
+ spinlock_t closeLock;
+ unsigned int closeFlag;
+ volatile unsigned int *reset_reg = (unsigned int*) AVALANCHE_RST_CTRL_PRCR;
+ spin_lock_irqsave(&closeLock, closeFlag);
+ *reset_reg |= (1 << AVALANCHE_GPIO_RESET_BIT);
+ spin_unlock_irqrestore(&closeLock, closeFlag);
+}
+
+/****************************************************************************
+ * FUNCTION: avalanche_gpio_ctrl
+ ***************************************************************************/
+int avalanche_gpio_ctrl(unsigned int gpio_pin,
+ AVALANCHE_GPIO_PIN_MODE_T pin_mode,
+ AVALANCHE_GPIO_PIN_DIRECTION_T pin_direction)
+{
+ spinlock_t closeLock;
+ unsigned int closeFlag;
+ volatile unsigned int *gpio_ctrl = (unsigned int*)AVALANCHE_GPIO_ENBL;
+
+ if(gpio_pin >= 32)
+ return(-1);
+
+ spin_lock_irqsave(&closeLock, closeFlag);
+
+ if(pin_mode == GPIO_PIN)
+ {
+ *gpio_ctrl |= (1 << gpio_pin);
+
+ gpio_ctrl = (unsigned int*)AVALANCHE_GPIO_DIR;
+
+ if(pin_direction == GPIO_INPUT_PIN)
+ *gpio_ctrl |= (1 << gpio_pin);
+ else
+ *gpio_ctrl &= ~(1 << gpio_pin);
+ }
+ else /* FUNCTIONAL PIN */
+ {
+ *gpio_ctrl &= ~(1 << gpio_pin);
+ }
+
+ spin_unlock_irqrestore(&closeLock, closeFlag);
+
+ return (0);
+}
+
+/****************************************************************************
+ * FUNCTION: avalanche_gpio_out
+ ***************************************************************************/
+int avalanche_gpio_out_bit(unsigned int gpio_pin, int value)
+{
+ spinlock_t closeLock;
+ unsigned int closeFlag;
+ volatile unsigned int *gpio_out = (unsigned int*) AVALANCHE_GPIO_DATA_OUT;
+
+ if(gpio_pin >= 32)
+ return(-1);
+
+ spin_lock_irqsave(&closeLock, closeFlag);
+ if(value == TRUE)
+ *gpio_out |= 1 << gpio_pin;
+ else
+ *gpio_out &= ~(1 << gpio_pin);
+ spin_unlock_irqrestore(&closeLock, closeFlag);
+
+ return(0);
+}
+
+/****************************************************************************
+ * FUNCTION: avalanche_gpio_in
+ ***************************************************************************/
+int avalanche_gpio_in_bit(unsigned int gpio_pin)
+{
+ spinlock_t closeLock;
+ unsigned int closeFlag;
+ volatile unsigned int *gpio_in = (unsigned int*) AVALANCHE_GPIO_DATA_IN;
+ int ret_val = 0;
+
+ if(gpio_pin >= 32)
+ return(-1);
+
+ spin_lock_irqsave(&closeLock, closeFlag);
+ ret_val = ((*gpio_in) & (1 << gpio_pin));
+ spin_unlock_irqrestore(&closeLock, closeFlag);
+
+ return (ret_val);
+}
+
+/****************************************************************************
+ * FUNCTION: avalanche_gpio_out_val
+ ***************************************************************************/
+int avalanche_gpio_out_value(unsigned int out_val, unsigned int out_mask,
+ unsigned int reg_index)
+{
+ spinlock_t closeLock;
+ unsigned int closeFlag;
+ volatile unsigned int *gpio_out = (unsigned int*) AVALANCHE_GPIO_DATA_OUT;
+
+ if(reg_index > 0)
+ return(-1);
+
+ spin_lock_irqsave(&closeLock, closeFlag);
+ *gpio_out &= ~out_mask;
+ *gpio_out |= out_val;
+ spin_unlock_irqrestore(&closeLock, closeFlag);
+
+ return(0);
+}
+
+/****************************************************************************
+ * FUNCTION: avalanche_gpio_in_value
+ ***************************************************************************/
+int avalanche_gpio_in_value(unsigned int* in_val, unsigned int reg_index)
+{
+ spinlock_t closeLock;
+ unsigned int closeFlag;
+ volatile unsigned int *gpio_in = (unsigned int*) AVALANCHE_GPIO_DATA_IN;
+
+ if(reg_index > 0)
+ return(-1);
+
+ spin_lock_irqsave(&closeLock, closeFlag);
+ *in_val = *gpio_in;
+ spin_unlock_irqrestore(&closeLock, closeFlag);
+
+ return (0);
+}
+
+/***********************************************************************
+ *
+ * Wakeup Control Module for TNETV1050 Communication Processor
+ *
+ ***********************************************************************/
+
+#define AVALANCHE_WAKEUP_POLARITY_BIT 16
+
+void avalanche_wakeup_ctrl(AVALANCHE_WAKEUP_INTERRUPT_T wakeup_int,
+ AVALANCHE_WAKEUP_CTRL_T wakeup_ctrl,
+ AVALANCHE_WAKEUP_POLARITY_T wakeup_polarity)
+{
+ volatile unsigned int *wakeup_status_reg = (unsigned int*) AVALANCHE_WAKEUP_CTRL_WKCR;
+
+ /* enable/disable */
+ if (wakeup_ctrl == WAKEUP_ENABLED)
+ /* enable wakeup */
+ *wakeup_status_reg |= wakeup_int;
+ else
+ /* disable wakeup */
+ *wakeup_status_reg &= (~wakeup_int);
+
+ /* set polarity */
+ if (wakeup_polarity == WAKEUP_ACTIVE_LOW)
+ *wakeup_status_reg |= (wakeup_int << AVALANCHE_WAKEUP_POLARITY_BIT);
+ else
+ *wakeup_status_reg &= ~(wakeup_int << AVALANCHE_WAKEUP_POLARITY_BIT);
+}
+
+void avalanche_set_vbus_freq(unsigned int new_vbus_freq)
+{
+ avalanche_vbus_freq = new_vbus_freq;
+}
+
+unsigned int avalanche_get_vbus_freq()
+{
+ return(avalanche_vbus_freq);
+}
+
+unsigned int avalanche_get_chip_version_info()
+{
+ return(*(volatile unsigned int*)AVALANCHE_CVR);
+}
+
+SET_MDIX_ON_CHIP_FN_T p_set_mdix_on_chip_fn = NULL;
+
+int avalanche_set_mdix_on_chip(unsigned int base_addr, unsigned int operation)
+{
+ if(p_set_mdix_on_chip_fn)
+ return (p_set_mdix_on_chip_fn(base_addr, operation));
+ else
+ return(-1);
+}
+
+unsigned int avalanche_is_mdix_on_chip(void)
+{
+ return(p_set_mdix_on_chip_fn ? 1:0);
+}
+
+EXPORT_SYMBOL(avalanche_reset_ctrl);
+EXPORT_SYMBOL(avalanche_get_reset_status);
+EXPORT_SYMBOL(avalanche_sys_reset);
+EXPORT_SYMBOL(avalanche_get_sys_last_reset_status);
+EXPORT_SYMBOL(avalanche_power_ctrl);
+EXPORT_SYMBOL(avalanche_get_power_status);
+EXPORT_SYMBOL(avalanche_set_global_power_mode);
+EXPORT_SYMBOL(avalanche_get_global_power_mode);
+EXPORT_SYMBOL(avalanche_set_mdix_on_chip);
+EXPORT_SYMBOL(avalanche_is_mdix_on_chip);
+
+EXPORT_SYMBOL(avalanche_gpio_init);
+EXPORT_SYMBOL(avalanche_gpio_ctrl);
+EXPORT_SYMBOL(avalanche_gpio_out_bit);
+EXPORT_SYMBOL(avalanche_gpio_in_bit);
+EXPORT_SYMBOL(avalanche_gpio_out_value);
+EXPORT_SYMBOL(avalanche_gpio_in_value);
+
+EXPORT_SYMBOL(avalanche_set_vbus_freq);
+EXPORT_SYMBOL(avalanche_get_vbus_freq);
+
+EXPORT_SYMBOL(avalanche_get_chip_version_info);
+
diff -urN linux.old/arch/mips/ar7/platform.h linux.dev/arch/mips/ar7/platform.h
--- linux.old/arch/mips/ar7/platform.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/arch/mips/ar7/platform.h 2005-08-12 19:34:07.216666616 +0200
@@ -0,0 +1,65 @@
+#ifndef _PLATFORM_H_
+#define _PLATFORM_H_
+
+#include <linux/config.h>
+
+
+/* Important: The definition of ENV_SPACE_SIZE should match with that in
+ * PSPBoot. (/psp_boot/inc/psbl/env.h)
+ */
+#ifdef CONFIG_MIPS_AVALANCHE_TICFG
+#define ENV_SPACE_SIZE (10 * 1024)
+#endif
+
+#ifdef CONFIG_MIPS_TNETV1050SDB
+#define TNETV1050SDB
+#define DUAL_FLASH
+#endif
+
+#ifdef CONFIG_MIPS_AR7DB
+#define TNETD73XX_BOARD
+#define AR7DB
+#endif
+
+#ifdef CONFIG_MIPS_AR7RD
+#define TNETD73XX_BOARD
+#define AR7RD
+#endif
+
+#ifdef CONFIG_AR7WRD
+#define TNETD73XX_BOARD
+#define AR7WRD
+#endif
+
+#ifdef CONFIG_MIPS_AR7VWI
+#define TNETD73XX_BOARD
+#define AR7VWi
+#endif
+
+/* Merging from the DEV_DSL-PSPL4.3.2.7_Patch release. */
+#ifdef CONFIG_MIPS_AR7VW
+#define TNETD73XX_BOARD
+#define AR7WRD
+#endif
+
+#ifdef CONFIG_MIPS_AR7WI
+#define TNETD73XX_BOARD
+#define AR7Wi
+#endif
+
+#ifdef CONFIG_MIPS_AR7V
+#define TNETD73XX_BOARD
+#define AR7V
+#endif
+
+#ifdef CONFIG_MIPS_AR7V
+#define TNETD73XX_BOARD
+#define AR7V
+#endif
+
+#ifdef CONFIG_MIPS_WA1130
+#define AVALANCHE
+#define WLAN
+#endif
+
+#endif
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-08-12 19:32:05.139225208 +0200
@@ -0,0 +1,53 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * Putting things on the screen/serial line using Adam2 facilities.
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/serial_reg.h>
+#include <linux/spinlock.h>
+#include <asm/io.h>
+#include <asm/serial.h>
+#include <asm/addrspace.h>
+
+#define AVALANCHE_YAMON_FUNCTION_BASE (KSEG1ADDR(0x10000500))
+#define AVALANCHE_YAMON_PROM_PRINT_COUNT_ADDR (AVALANCHE_YAMON_FUNCTION_BASE + 0x4)
+
+static char ppbuf[1024];
+
+void (*prom_print_str)(unsigned int out, char *s, int len);
+
+void prom_printf(char *fmt, ...) __init;
+void prom_printf(char *fmt, ...)
+{
+ va_list args;
+ int len;
+ prom_print_str = (void *)*(unsigned int *)AVALANCHE_YAMON_PROM_PRINT_COUNT_ADDR;
+
+ va_start(args, fmt);
+ vsprintf(ppbuf, fmt, args);
+ len = strlen(ppbuf);
+
+ prom_print_str(1, ppbuf, len);
+
+ va_end(args);
+ return;
+
+}
diff -urN linux.old/arch/mips/ar7/psp_env.c linux.dev/arch/mips/ar7/psp_env.c
--- linux.old/arch/mips/ar7/psp_env.c 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/arch/mips/ar7/psp_env.c 2005-08-12 19:34:07.216666616 +0200
@@ -0,0 +1,350 @@
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <asm/io.h>
+
+#include "platform.h"
+
+#define ENV_CELL_SIZE 16
+
+/* control field decode */
+#define ENV_GARBAGE_BIT 0x01 /* Env is garbage if this bit is off */
+#define ENV_DYNAMIC_BIT 0x02 /* Env is dynamic if this bit is off */
+
+#define ENV_CTRL_MASK 0x03
+#define ENV_PREFINED (ENV_GARBAGE_BIT | ENV_DYNAMIC_BIT)
+#define ENV_DYNAMIC (ENV_GARBAGE_BIT)
+
+struct env_variable {
+ unsigned char varNum;
+ unsigned char ctrl;
+ unsigned short chksum;
+ unsigned char numCells;
+ unsigned char data[ENV_CELL_SIZE - 5]; /* The data section starts
+ * here, continues for
+ * numCells.
+ */
+};
+
+extern unsigned int max_env_entry;
+
+/* Internal macros */
+#define get_next_block(var) ((struct env_variable *)( (char*)(var) + (var)->numCells * ENV_CELL_SIZE))
+
+typedef enum ENV_VARS {
+ env_vars_start = 0,
+ CPUFREQ,
+ MEMSZ,
+ FLASHSZ,
+ MODETTY0,
+ MODETTY1,
+ PROMPT,
+ BOOTCFG,
+ HWA_0,
+#if !defined (AVALANCHE) || defined(TNETC401B)
+ HWA_1,
+#endif
+#if !defined(TNETV1020_BOARD)
+ HWA_RNDIS,
+#endif
+#if defined (TNETD73XX_BOARD)
+ HWA_3,
+#endif
+ IPA,
+ IPA_SVR,
+ BLINE_MAC0,
+#if !defined (AVALANCHE) || defined(TNETC401B)
+ BLINE_MAC1,
+#endif
+#if !defined(TNETV1020_BOARD)
+ BLINE_RNDIS,
+#endif
+#if defined (TNETD73XX_BOARD)
+ BLINE_ATM,
+#endif
+#if !defined(TNETV1020_BOARD)
+ USB_PID,
+ USB_VID,
+ USB_EPPOLLI,
+#endif
+ IPA_GATEWAY,
+ SUBNET_MASK,
+#if defined (TNETV1050_BOARD)
+ BLINE_ESWITCH,
+#endif
+#if !defined(TNETV1020_BOARD)
+ USB_SERIAL,
+ HWA_HRNDIS, /* Host (PC) side RNDIS address */
+#endif
+ REMOTE_USER,
+ REMOTE_PASS,
+ REMOTE_DIR,
+ SYSFREQ,
+ LINK_TIMEOUT,
+#ifndef AVALANCHE /* Avalanche boards use only one mac port */
+ MAC_PORT,
+#endif
+ PATH,
+ HOSTNAME,
+#ifdef WLAN
+ HW_REV_MAJOR,
+ HW_REV_MINOR,
+ HW_PATCH,
+ SW_PATCH,
+ SERIAL_NUMBER,
+#endif
+ TFTPCFG,
+#if defined (TNETV1050_BOARD)
+ HWA_ESWITCH,
+#endif
+ /*
+ * Add new env variables here.
+ * NOTE: New environment variables should always be placed at the end, ie
+ * just before env_vars_end.
+ */
+
+ env_vars_end
+} ENV_VARS;
+
+
+struct env_description {
+ ENV_VARS idx;
+ char *nm;
+ char *alias;
+};
+
+#define ENVSTR(x) #x
+#define _ENV_ENTRY(x) {.idx = x, .nm = ENVSTR(x), .alias = NULL}
+
+struct env_description env_ns[] = {
+ _ENV_ENTRY(env_vars_start), /* start. */
+ _ENV_ENTRY(CPUFREQ),
+ _ENV_ENTRY(MEMSZ),
+ _ENV_ENTRY(FLASHSZ),
+ _ENV_ENTRY(MODETTY0),
+ _ENV_ENTRY(MODETTY1),
+ _ENV_ENTRY(PROMPT),
+ _ENV_ENTRY(BOOTCFG),
+ _ENV_ENTRY(HWA_0),
+#if !defined (AVALANCHE) || defined(TNETC401B)
+ _ENV_ENTRY(HWA_1),
+#endif
+#if !defined(TNETV1020_BOARD)
+ _ENV_ENTRY(HWA_RNDIS),
+#endif
+#if defined (TNETD73XX_BOARD)
+ _ENV_ENTRY(HWA_3),
+#endif
+ _ENV_ENTRY(IPA),
+ _ENV_ENTRY(IPA_SVR),
+ _ENV_ENTRY(IPA_GATEWAY),
+ _ENV_ENTRY(SUBNET_MASK),
+ _ENV_ENTRY(BLINE_MAC0),
+#if !defined (AVALANCHE) || defined(TNETC401B)
+ _ENV_ENTRY(BLINE_MAC1),
+#endif
+#if !defined(TNETV1020_BOARD)
+ _ENV_ENTRY(BLINE_RNDIS),
+#endif
+#if defined (TNETD73XX_BOARD)
+ _ENV_ENTRY(BLINE_ATM),
+#endif
+#if !defined(TNETV1020_BOARD)
+ _ENV_ENTRY(USB_PID),
+ _ENV_ENTRY(USB_VID),
+ _ENV_ENTRY(USB_EPPOLLI),
+#endif
+#if defined (TNETV1050_BOARD)
+ _ENV_ENTRY(BLINE_ESWITCH),
+#endif
+#if !defined(TNETV1020_BOARD)
+ _ENV_ENTRY(USB_SERIAL),
+ _ENV_ENTRY(HWA_HRNDIS),
+#endif
+ _ENV_ENTRY(REMOTE_USER),
+ _ENV_ENTRY(REMOTE_PASS),
+ _ENV_ENTRY(REMOTE_DIR),
+ _ENV_ENTRY(SYSFREQ),
+ _ENV_ENTRY(LINK_TIMEOUT),
+#ifndef AVALANCHE /* Avalanche boards use only one mac port */
+ _ENV_ENTRY(MAC_PORT),
+#endif
+ _ENV_ENTRY(PATH),
+ _ENV_ENTRY(HOSTNAME),
+#ifdef WLAN
+ _ENV_ENTRY(HW_REV_MAJOR),
+ _ENV_ENTRY(HW_REV_MINOR),
+ _ENV_ENTRY(HW_PATCH),
+ _ENV_ENTRY(SW_PATCH),
+ _ENV_ENTRY(SERIAL_NUMBER),
+#endif
+ _ENV_ENTRY(TFTPCFG),
+#if defined (TNETV1050_BOARD)
+ _ENV_ENTRY(HWA_ESWITCH),
+#endif
+ /*
+ * Add new entries below this.
+ */
+ /* Adam2 environment name alias. */
+ { .idx = IPA, .nm = "my_ipaddress" },
+ { .idx = CPUFREQ, .nm = "cpufrequency" },
+ { .idx = SYSFREQ, .nm = "sysfrequency" },
+ { .idx = HWA_0, .nm = "maca" },
+#ifndef AVALANCHE
+ { .idx = HWA_1, .nm = "macb" },
+#endif
+ { .idx = MODETTY0, .nm = "modetty0" },
+ { .idx = MODETTY1, .nm = "modetty1" },
+ { .idx = MEMSZ, .nm = "memsize" },
+
+ _ENV_ENTRY(env_vars_end) /* delimiter. */
+};
+
+static inline int var_to_idx(const char* var)
+{
+ int ii;
+
+ /* go over the list of pre-defined environment variables */
+ for (ii = env_vars_start; env_ns[ii].idx != env_vars_end; ii++){
+ /* check if the env variable is listed */
+ if (strcmp(env_ns[ii].nm, var) == 0) {
+ return env_ns[ii].idx;
+ }
+
+ /* if an alias is present, check if the alias matches
+ * the description
+ */
+ if (env_ns[ii].alias != NULL) {
+ if (strcmp(env_ns[ii].alias, var) == 0) {
+ return env_ns[ii].idx;
+ }
+ }
+ }
+ return 0;
+}
+
+extern int *_prom_envp;
+
+/* FIXME: reading from the flash is extremly unstable. Sometime a read returns garbage,
+ * the next read some seconds later is ok. It looks like something is hidding or
+ * overlay the flash address at 0xb0000000. Is this possible?
+ *
+ * The readb() and while() usage below is a attempt of a workarround - with limited success.
+ */
+
+static inline struct env_variable* get_var_by_number(int index)
+{
+ struct env_variable *env_var = (struct env_variable *)_prom_envp;
+ volatile unsigned char nr;
+ int i;
+
+ env_var++; /* skip signature */
+
+ i = 0;
+ nr = readb(&(env_var->varNum));
+
+ while (i < max_env_entry && nr != 0xFF) {
+ if ((env_var->ctrl & ENV_CTRL_MASK) == ENV_PREFINED) {
+ if (nr == index) {
+ return env_var;
+ }
+ }
+ i++;
+ env_var = get_next_block(env_var);
+ nr = readb(&(env_var->varNum));
+ }
+
+ return NULL;
+}
+
+static inline struct env_variable* get_var_by_name(char *var)
+{
+ struct env_variable *env_var = (struct env_variable *)_prom_envp;
+ volatile unsigned char nr;
+ int i;
+
+ env_var++; /* skip signature */
+
+ nr = readb(&(env_var->varNum));
+ i = 0;
+
+ while (i < max_env_entry && nr != 0xFF) {
+ if ((env_var->ctrl & ENV_CTRL_MASK) == ENV_DYNAMIC) {
+ if (strcmp(var, env_var->data) == 0)
+ return env_var;
+ }
+ i++;
+ env_var = get_next_block(env_var);
+ nr = readb(&(env_var->varNum));
+ }
+ return NULL;
+}
+
+static inline struct env_variable* get_var(char *var)
+{
+ int index = var_to_idx(var);
+
+ if (index)
+ return get_var_by_number(index);
+ else
+ return get_var_by_name(var);
+
+ return NULL;
+}
+
+static inline char *get_value(struct env_variable* env_var)
+{
+ unsigned char *name;
+ unsigned char *value;
+ unsigned short chksum;
+ int i;
+
+ chksum = env_var->varNum + env_var->ctrl + env_var->numCells;
+
+ if ((env_var->ctrl & ENV_CTRL_MASK) == ENV_DYNAMIC) {
+ name = env_var->data;
+ value = env_var->data + strlen(name) + 1;
+
+ for(i = 0; i < strlen(name); i++)
+ chksum += name[i];
+ } else
+ value = env_var->data;
+
+ for (i = 0; i < strlen(value); i++)
+ chksum += value[i];
+
+ chksum += env_var->chksum;
+ chksum = ~(chksum);
+
+ if(chksum != 0) {
+ return NULL;
+ }
+
+ return value;
+}
+
+struct psbl_rec {
+ unsigned int psbl_size;
+ unsigned int env_base;
+ unsigned int env_size;
+ unsigned int ffs_base;
+ unsigned int ffs_size;
+};
+
+char *prom_psp_getenv(char *envname)
+{
+ struct env_variable* env_var;
+ char *value;
+
+ if (strcmp("bootloader", envname) == 0)
+ return "PSPBoot";
+
+ if (!(env_var = get_var(envname)))
+ return NULL;
+
+ value = get_value(env_var);
+
+ return value;
+}
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-08-12 19:32:05.139225208 +0200
@@ -0,0 +1,56 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
+ *
+ * ########################################################################
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * ########################################################################
+ *
+ * Reset the MIPS boards.
+ *
+ */
+#include <linux/config.h>
+
+#include <asm/reboot.h>
+#include <asm/mips-boards/generic.h>
+
+static void ar7_machine_restart(char *command);
+static void ar7_machine_halt(void);
+static void ar7_machine_power_off(void);
+
+static void ar7_machine_restart(char *command)
+{
+ volatile unsigned int *softres_reg = (void *)(KSEG1ADDR(0x08611600 + 0x4));
+
+ *softres_reg = 1;
+}
+
+static void ar7_machine_halt(void)
+{
+
+}
+
+static void ar7_machine_power_off(void)
+{
+
+}
+
+void ar7_reboot_setup(void)
+{
+ _machine_restart = ar7_machine_restart;
+ _machine_halt = ar7_machine_halt;
+ _machine_power_off = ar7_machine_power_off;
+}
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-08-12 19:32:05.139225208 +0200
@@ -0,0 +1,120 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ */
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/mc146818rtc.h>
+#include <linux/ioport.h>
+
+#include <asm/cpu.h>
+#include <asm/bootinfo.h>
+#include <asm/irq.h>
+#include <asm/mips-boards/generic.h>
+#include <asm/mips-boards/prom.h>
+
+#include <asm/dma.h>
+#include <asm/time.h>
+#include <asm/traps.h>
+
+#ifdef CONFIG_KGDB
+extern void rs_kgdb_hook(int);
+int remote_debug = 0;
+#endif
+
+extern struct rtc_ops no_rtc_ops;
+
+extern void ar7_reboot_setup(void);
+
+extern void ar7_time_init(void);
+extern void ar7_timer_setup(struct irqaction *irq);
+
+const char *get_system_type(void)
+{
+ return "Texas Instruments AR7";
+}
+
+void __init ar7_setup(void)
+{
+#ifdef CONFIG_KGDB
+ int rs_putDebugChar(char);
+ char rs_getDebugChar(void);
+ extern int (*generic_putDebugChar)(char);
+ extern char (*generic_getDebugChar)(void);
+#endif
+ char *argptr;
+#ifdef CONFIG_SERIAL_CONSOLE
+ argptr = prom_getcmdline();
+ if ((argptr = strstr(argptr, "console=")) == NULL) {
+ char console[20];
+ char *s;
+ int i = 0;
+
+ s = prom_getenv("modetty0");
+ strcpy(console, "38400");
+
+ if (s != NULL) {
+ while (s[i] >= '0' && s[i] <= '9')
+ i++;
+
+ if (i > 0) {
+ strncpy(console, s, i);
+ console[i] = 0;
+ }
+ }
+
+ argptr = prom_getcmdline();
+ strcat(argptr, " console=ttyS0,");
+ strcat(argptr, console);
+ }
+#endif
+
+#ifdef CONFIG_KGDB
+ argptr = prom_getcmdline();
+ if ((argptr = strstr(argptr, "kgdb=ttyS")) != NULL) {
+ int line;
+ argptr += strlen("kgdb=ttyS");
+ if (*argptr != '0' && *argptr != '1')
+ printk("KGDB: Uknown serial line /dev/ttyS%c, "
+ "falling back to /dev/ttyS1\n", *argptr);
+ line = *argptr == '0' ? 0 : 1;
+ printk("KGDB: Using serial line /dev/ttyS%d for session\n",
+ line ? 1 : 0);
+
+ rs_kgdb_hook(line);
+ generic_putDebugChar = rs_putDebugChar;
+ generic_getDebugChar = rs_getDebugChar;
+
+ prom_printf("KGDB: Using serial line /dev/ttyS%d for session, "
+ "please connect your debugger\n", line ? 1 : 0);
+
+ remote_debug = 1;
+ /* Breakpoints are in init_IRQ() */
+ }
+#endif
+
+ argptr = prom_getcmdline();
+ if ((argptr = strstr(argptr, "nofpu")) != NULL)
+ cpu_data[0].options &= ~MIPS_CPU_FPU;
+
+ rtc_ops = &no_rtc_ops;
+
+ ar7_reboot_setup();
+
+ board_time_init = ar7_time_init;
+ board_timer_setup = ar7_timer_setup;
+}
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-08-12 23:34:00.272589528 +0200
@@ -0,0 +1,124 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
+ *
+ * ########################################################################
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * ########################################################################
+ *
+ * Setting up the clock on the MIPS boards.
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/kernel_stat.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+
+#include <asm/mipsregs.h>
+#include <asm/ptrace.h>
+#include <asm/hardirq.h>
+#include <asm/div64.h>
+
+#include <linux/interrupt.h>
+#include <linux/mc146818rtc.h>
+#include <linux/timex.h>
+
+#include <asm/mips-boards/generic.h>
+#include <asm/mips-boards/prom.h>
+
+extern asmlinkage void mipsIRQ(void);
+
+static unsigned long r4k_offset; /* Amount to increment compare reg each time */
+static unsigned long r4k_cur; /* What counter should be at next timer irq */
+
+#define MIPS_CPU_TIMER_IRQ 7
+#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
+
+static inline void ack_r4ktimer(unsigned long newval)
+{
+ write_c0_compare(newval);
+}
+
+void ar7_timer_interrupt(struct pt_regs *regs)
+{
+ int cpu = smp_processor_id();
+
+ irq_enter(cpu, MIPS_CPU_TIMER_IRQ);
+
+ if (r4k_offset == 0)
+ goto null;
+
+ do {
+ kstat.irqs[cpu][MIPS_CPU_TIMER_IRQ]++;
+ do_timer(regs);
+ r4k_cur += r4k_offset;
+ ack_r4ktimer(r4k_cur);
+
+ } while (((unsigned long)read_c0_count()
+ - r4k_cur) < 0x7fffffff);
+
+ 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*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-08-12 19:32:05.140225056 +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;
+ }
+
+ }
+
+ }
+
+ gcd = find_gcd(num2,denom2);
+ num2 = num2 / gcd;
+ denom2 = denom2 /gcd;
+
+ *num = num2;
+ *denom = denom2;
+}
+
+
+/*****************************************************************************
+ * GPIO Control
+ *****************************************************************************/
+
+/****************************************************************************
+ * FUNCTION: tnetd73xx_gpio_init
+ ***************************************************************************/
+void tnetd73xx_gpio_init()
+{
+ /* Bring module out of reset */
+ tnetd73xx_reset_ctrl(RESET_MODULE_GPIO, OUT_OF_RESET);
+ REG32_WRITE(TNETD73XX_GPIOENR, 0xFFFFFFFF);
+}
+
+/****************************************************************************
+ * 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)
+{
+ 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);
+
+ /* 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);
+ }
+
+}
+
+/****************************************************************************
+ * FUNCTION: tnetd73xx_gpio_out
+ ***************************************************************************/
+void tnetd73xx_gpio_out(TNETD73XX_GPIO_PIN_T gpio_pin, int value)
+{
+ u32 pin_value;
+
+ 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 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.000000000 +0200
+++ linux.dev/arch/mips/config-shared.in 2005-08-12 19:53:15.060167880 +0200
@@ -20,6 +20,16 @@
mainmenu_option next_comment
comment 'Machine selection'
dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
+dep_bool 'Support for Texas Instruments AR7 (EXPERIMENTAL)' CONFIG_AR7 $CONFIG_MIPS32 $CONFIG_EXPERIMENTAL
+if [ "$CONFIG_AR7" = "y" ]; then
+ choice 'Texas Instruments Reference Platform' \
+ "AR7DB CONFIG_AR7DB \
+ AR7RD CONFIG_AR7RD \
+ AR7WRD CONFIG_AR7WRD" AR7DB
+ int 'Texas Instruments AR7 CPU Frequency' CONFIG_AR7_CPU 150
+ int 'Texas Instruments AR7 System Frequency' CONFIG_AR7_SYS 125
+ hex 'Texas Instruments AR7 SDRAM Start' CONFIG_AR7_MEMORY 0x14000000
+fi
dep_bool 'Support for Alchemy Bosporus board' CONFIG_MIPS_BOSPORUS $CONFIG_MIPS32
dep_bool 'Support for FIC Multimedia Player board' CONFIG_MIPS_FICMMP $CONFIG_MIPS32
dep_bool 'Support for Alchemy Mirage board' CONFIG_MIPS_MIRAGE $CONFIG_MIPS32
@@ -239,6 +249,10 @@
define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PC_KEYB y
fi
+if [ "$CONFIG_AR7" = "y" ]; then
+ define_bool CONFIG_NONCOHERENT_IO y
+ define_bool CONFIG_SWAP_IO_SPACE y
+fi
if [ "$CONFIG_CASIO_E55" = "y" ]; then
define_bool CONFIG_IRQ_CPU y
define_bool CONFIG_NONCOHERENT_IO y
@@ -736,6 +750,7 @@
mainmenu_option next_comment
comment 'General setup'
if [ "$CONFIG_ACER_PICA_61" = "y" -o \
+ "$CONFIG_AR7" = "y" -o \
"$CONFIG_CASIO_E55" = "y" -o \
"$CONFIG_DDB5074" = "y" -o \
"$CONFIG_DDB5476" = "y" -o \
@@ -797,6 +812,7 @@
bool 'Networking support' CONFIG_NET
if [ "$CONFIG_ACER_PICA_61" = "y" -o \
+ "$CONFIG_AR7" = "y" -o \
"$CONFIG_CASIO_E55" = "y" -o \
"$CONFIG_DECSTATION" = "y" -o \
"$CONFIG_IBM_WORKPAD" = "y" -o \
diff -urN linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
--- linux.old/arch/mips/kernel/head.S 2005-07-10 02:55:18.000000000 +0200
+++ linux.dev/arch/mips/kernel/head.S 2005-08-12 23:05:36.954533232 +0200
@@ -75,11 +75,11 @@
* size!
*/
NESTED(except_vec4, 0, sp)
- .set push
- .set noreorder
-1: j 1b /* Dummy, will be replaced */
- nop
- .set pop
+ .set mips2
+ lui k0, 0x9400
+ ori k0, 0x200
+ jr k0
+ nop
END(except_vec4)
/*
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.000000000 +0200
+++ linux.dev/arch/mips/kernel/irq.c 2005-08-12 19:32:05.142224752 +0200
@@ -76,6 +76,7 @@
* Generic, controller-independent functions:
*/
+#ifndef CONFIG_AR7
int get_irq_list(char *buf)
{
int i, j;
@@ -110,6 +111,7 @@
p += sprintf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
return p - buf;
}
+#endif
#ifdef CONFIG_SMP
int global_irq_holder = NO_PROC_ID;
@@ -525,6 +527,7 @@
*
*/
+#ifndef CONFIG_AR7
int request_irq(unsigned int irq,
void (*handler)(int, void *, struct pt_regs *),
unsigned long irqflags,
@@ -569,6 +572,7 @@
kfree(action);
return retval;
}
+#endif
/**
* free_irq - free an interrupt
@@ -588,6 +592,7 @@
* the machine.
*/
+#ifndef CONFIG_AR7
void free_irq(unsigned int irq, void *dev_id)
{
irq_desc_t *desc;
@@ -629,6 +634,7 @@
return;
}
}
+#endif
/*
* IRQ autodetection code..
diff -urN linux.old/arch/mips/kernel/mips_ksyms.c linux.dev/arch/mips/kernel/mips_ksyms.c
--- linux.old/arch/mips/kernel/mips_ksyms.c 2004-02-18 14:36:30.000000000 +0100
+++ linux.dev/arch/mips/kernel/mips_ksyms.c 2005-08-12 19:32:05.142224752 +0200
@@ -40,6 +40,12 @@
extern long __strnlen_user_nocheck_asm(const char *s);
extern long __strnlen_user_asm(const char *s);
+#ifdef CONFIG_AR7
+int avalanche_request_pacing(int irq_nr, unsigned int blk_num, unsigned int pace_value);
+char *prom_getenv(char *envname);
+#endif
+
+
EXPORT_SYMBOL(mips_machtype);
#ifdef CONFIG_EISA
EXPORT_SYMBOL(EISA_bus);
@@ -103,3 +109,9 @@
#endif
EXPORT_SYMBOL(get_wchan);
+
+#ifdef CONFIG_AR7
+EXPORT_SYMBOL_NOVERS(avalanche_request_pacing);
+EXPORT_SYMBOL_NOVERS(prom_getenv);
+#endif
+
diff -urN linux.old/arch/mips/kernel/setup.c linux.dev/arch/mips/kernel/setup.c
--- linux.old/arch/mips/kernel/setup.c 2005-07-10 03:00:44.000000000 +0200
+++ linux.dev/arch/mips/kernel/setup.c 2005-08-12 19:56:27.917849056 +0200
@@ -235,7 +235,11 @@
#define PFN_DOWN(x) ((x) >> PAGE_SHIFT)
#define PFN_PHYS(x) ((x) << PAGE_SHIFT)
+#ifdef CONFIG_AR7
+#define MAXMEM HIGHMEM_START + CONFIG_AR7_MEMORY
+#else
#define MAXMEM HIGHMEM_START
+#endif
#define MAXMEM_PFN PFN_DOWN(MAXMEM)
static inline void bootmem_init(void)
@@ -320,7 +324,12 @@
#endif
/* Initialize the boot-time allocator with low memory only. */
+#ifdef CONFIG_AR7
+ bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn,
+ CONFIG_AR7_MEMORY >> PAGE_SHIFT, max_low_pfn);
+#else
bootmap_size = init_bootmem(first_usable_pfn, max_low_pfn);
+#endif
/*
* Register fully available low RAM pages with the bootmem allocator.
@@ -494,6 +503,7 @@
void hp_setup(void);
void au1x00_setup(void);
void frame_info_init(void);
+ void ar7_setup(void);
frame_info_init();
#if defined(CONFIG_BLK_DEV_FD) || defined(CONFIG_BLK_DEV_FD_MODULE)
@@ -691,6 +701,11 @@
pmc_yosemite_setup();
break;
#endif
+#ifdef CONFIG_AR7
+ case MACH_GROUP_UNKNOWN:
+ ar7_setup();
+ break;
+#endif
default:
panic("Unsupported architecture");
}
diff -urN linux.old/arch/mips/kernel/traps.c linux.dev/arch/mips/kernel/traps.c
--- linux.old/arch/mips/kernel/traps.c 2005-07-10 03:00:44.000000000 +0200
+++ linux.dev/arch/mips/kernel/traps.c 2005-08-12 23:38:46.505075576 +0200
@@ -869,9 +869,15 @@
exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) {
+#ifdef CONFIG_AR7
+ *(volatile u32 *)(KSEG0+0x200+CONFIG_AR7_MEMORY) = 0x08000000 |
+ (0x03ffffff & (handler >> 2));
+ flush_icache_range(KSEG0+0x200+CONFIG_AR7_MEMORY, KSEG0 + 0x204 + CONFIG_AR7_MEMORY);
+#else
*(volatile u32 *)(KSEG0+0x200) = 0x08000000 |
(0x03ffffff & (handler >> 2));
flush_icache_range(KSEG0+0x200, KSEG0 + 0x204);
+#endif
}
return (void *)old_handler;
}
@@ -1022,6 +1028,12 @@
if (board_nmi_handler_setup)
board_nmi_handler_setup();
+#ifdef CONFIG_AR7
+ memcpy((void *)(KSEG0 + CONFIG_AR7_MEMORY + 0x80), &except_vec1_generic, 0x80);
+ memcpy((void *)(KSEG0 + CONFIG_AR7_MEMORY + 0x180), &except_vec3_generic, 0x80);
+ memcpy((void *)(KSEG0 + CONFIG_AR7_MEMORY + 0x200), &except_vec4, 8);
+ flush_icache_range(KSEG0 + CONFIG_AR7_MEMORY, KSEG0 + CONFIG_AR7_MEMORY + 0x208);
+#endif
flush_icache_range(KSEG0, KSEG0 + 0x400);
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.000000000 +0200
+++ linux.dev/arch/mips/lib/promlib.c 2005-08-12 20:39:57.087195024 +0200
@@ -1,6 +1,8 @@
#include <stdarg.h>
#include <linux/kernel.h>
+#include <linux/config.h>
+#ifndef CONFIG_AR7
extern void prom_putchar(char);
void prom_printf(char *fmt, ...)
@@ -22,3 +24,4 @@
}
va_end(args);
}
+#endif
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
--- linux.old/arch/mips/Makefile 2005-07-10 03:00:44.000000000 +0200
+++ linux.dev/arch/mips/Makefile 2005-08-12 20:38:28.398677728 +0200
@@ -369,6 +369,16 @@
endif
#
+# Texas Instruments AR7
+#
+
+ifdef CONFIG_AR7
+LIBS += arch/mips/ar7/ar7.o
+SUBDIRS += arch/mips/ar7
+LOADADDR += 0x94020000
+endif
+
+#
# DECstation family
#
ifdef CONFIG_DECSTATION
diff -urN linux.old/arch/mips/mm/init.c linux.dev/arch/mips/mm/init.c
--- linux.old/arch/mips/mm/init.c 2005-07-10 03:00:44.000000000 +0200
+++ linux.dev/arch/mips/mm/init.c 2005-08-12 21:08:04.420681344 +0200
@@ -248,6 +248,9 @@
max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
low = max_low_pfn;
+#ifdef CONFIG_AR7
+ low = NODE_DATA(0)->bdata->node_low_pfn - (CONFIG_AR7_MEMORY >> PAGE_SHIFT);
+#endif
high = highend_pfn;
#ifdef CONFIG_ISA
@@ -270,7 +273,11 @@
zones_size[ZONE_HIGHMEM] = high - low;
#endif
+#ifdef CONFIG_AR7
+ free_area_init_node(0, NODE_DATA(0), 0, zones_size, CONFIG_AR7_MEMORY, 0);
+#else
free_area_init(zones_size);
+#endif
}
#define PFN_UP(x) (((x) + PAGE_SIZE - 1) >> PAGE_SHIFT)
@@ -298,6 +305,10 @@
return 0;
}
+#ifdef CONFIG_AR7
+#define START_PFN (NODE_DATA(0)->bdata->node_boot_start >> PAGE_SHIFT)
+#define MAX_LOW_PFN (NODE_DATA(0)->bdata->node_low_pfn)
+#endif
void __init mem_init(void)
{
unsigned long codesize, reservedpages, datasize, initsize;
@@ -315,9 +326,21 @@
#else
max_mapnr = num_mappedpages = num_physpages = max_low_pfn;
#endif
+
+#ifdef CONFIG_AR7
+ max_mapnr = num_mappedpages = num_physpages = MAX_LOW_PFN - START_PFN;
+ high_memory = (void *) __va(MAX_LOW_PFN * PAGE_SIZE);
+
+#if 0
+ /* WTF? */
+ free_bootmem_node(NODE_DATA(0), (CONFIG_AR7_MEMORY+PAGE_SIZE), (__pa(&_ftext))-(CONFIG_AR7_MEMORY+PAGE_SIZE));
+#endif
+ totalram_pages += free_all_bootmem_node(NODE_DATA(0));
+#else
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
-
totalram_pages += free_all_bootmem();
+#endif
+
totalram_pages -= setup_zero_pages(); /* Setup zeroed pages. */
reservedpages = ram = 0;
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.000000000 +0200
+++ linux.dev/drivers/char/serial.c 2005-08-12 19:32:05.147223992 +0200
@@ -419,7 +419,40 @@
return 0;
}
-#if defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_SEAD)
+#if defined(CONFIG_AR7)
+
+static _INLINE_ unsigned int serial_in(struct async_struct *info, int offset)
+{
+ return (inb(info->port + (offset * 4)) & 0xff);
+}
+
+
+static _INLINE_ unsigned int serial_inp(struct async_struct *info, int offset)
+{
+#ifdef CONFIG_SERIAL_NOPAUSE_IO
+ return (inb(info->port + (offset * 4)) & 0xff);
+#else
+ return (inb_p(info->port + (offset * 4)) & 0xff);
+#endif
+}
+
+static _INLINE_ void serial_out(struct async_struct *info, int offset, int value)
+{
+ outb(value, info->port + (offset * 4));
+}
+
+
+static _INLINE_ void serial_outp(struct async_struct *info, int offset,
+ int value)
+{
+#ifdef CONFIG_SERIAL_NOPAUSE_IO
+ outb(value, info->port + (offset * 4));
+#else
+ outb_p(value, info->port + (offset * 4));
+#endif
+}
+
+#elif defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_SEAD)
#include <asm/mips-boards/atlas.h>
@@ -478,8 +511,10 @@
* needed for certain old 386 machines, I've left these #define's
* in....
*/
+#ifndef CONFIG_AR7
#define serial_inp(info, offset) serial_in(info, offset)
#define serial_outp(info, offset, value) serial_out(info, offset, value)
+#endif
/*
@@ -1728,7 +1763,15 @@
/* Special case since 134 is really 134.5 */
quot = (2*baud_base / 269);
else if (baud)
+#ifdef CONFIG_AR7
+ quot = (CONFIG_AR7_SYS*500000) / baud;
+
+ if ((quot%16)>7)
+ quot += 8;
+ quot /=16;
+#else
quot = baud_base / baud;
+#endif
}
/* If the quotient is zero refuse the change */
if (!quot && old_termios) {
@@ -5552,8 +5595,10 @@
state->irq = irq_cannonicalize(state->irq);
if (state->hub6)
state->io_type = SERIAL_IO_HUB6;
+#ifndef CONFIG_AR7
if (state->port && check_region(state->port,8))
continue;
+#endif
#ifdef CONFIG_MCA
if ((state->flags & ASYNC_BOOT_ONLYMCA) && !MCA_bus)
continue;
@@ -6009,7 +6054,15 @@
info->io_type = state->io_type;
info->iomem_base = state->iomem_base;
info->iomem_reg_shift = state->iomem_reg_shift;
+#ifdef CONFIG_AR7
+ quot = (CONFIG_AR7_SYS*500000) / baud;
+
+ if ((quot%16)>7)
+ quot += 8;
+ quot /=16;
+#else
quot = state->baud_base / baud;
+#endif
cval = cflag & (CSIZE | CSTOPB);
#if defined(__powerpc__) || defined(__alpha__)
cval >>= 8;
diff -urN linux.old/include/asm-mips/ar7/ar7.h linux.dev/include/asm-mips/ar7/ar7.h
--- linux.old/include/asm-mips/ar7/ar7.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/include/asm-mips/ar7/ar7.h 2005-08-12 19:32:05.147223992 +0200
@@ -0,0 +1,33 @@
+/*
+ * $Id$
+ * Copyright (C) $Date$ $Author$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifndef _AR7_H
+#define _AR7_H
+
+#include <asm/addrspace.h>
+#include <linux/config.h>
+
+#define AVALANCHE_VECS_KSEG0 (KSEG0ADDR(CONFIG_AR7_MEMORY))
+
+#define AR7_UART0_REGS_BASE (KSEG1ADDR(0x08610E00))
+#define AR7_UART1_REGS_BASE (KSEG1ADDR(0x08610F00))
+#define AR7_BASE_BAUD ( 3686400 / 16 )
+
+#endif
diff -urN linux.old/include/asm-mips/ar7/avalanche_intc.h linux.dev/include/asm-mips/ar7/avalanche_intc.h
--- linux.old/include/asm-mips/ar7/avalanche_intc.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/include/asm-mips/ar7/avalanche_intc.h 2005-08-12 19:32:05.148223840 +0200
@@ -0,0 +1,283 @@
+ /*
+ * Nitin Dhingra, iamnd@ti.com
+ * Copyright (C) 2000 Texas Instruments Inc.
+ *
+ *
+ * ########################################################################
+ *
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * ########################################################################
+ *
+ * Defines of the Sead board specific address-MAP, registers, etc.
+ *
+ */
+#ifndef _AVALANCHE_INTC_H
+#define _AVALANCHE_INTC_H
+
+/* ----- */
+
+#define KSEG1_BASE 0xA0000000
+#define KSEG_INV_MASK 0x1FFFFFFF /* Inverted mask for kseg address */
+#define PHYS_ADDR(addr) ((addr) & KSEG_INV_MASK)
+#define PHYS_TO_K1(addr) (PHYS_ADDR(addr)|KSEG1_BASE)
+#define AVALANCHE_INTC_BASE PHYS_TO_K1(0x08612400)
+
+/* ----- */
+
+#define MIPS_EXCEPTION_OFFSET 8
+
+/******************************************************************************
+ Avalanche Interrupt number
+******************************************************************************/
+#define AVINTNUM(x) ((x) - MIPS_EXCEPTION_OFFSET)
+
+/*******************************************************************************
+*Linux Interrupt number
+*******************************************************************************/
+#define LNXINTNUM(x)((x) + MIPS_EXCEPTION_OFFSET)
+
+
+
+#define AVALANCHE_INT_END_PRIMARY (40 + MIPS_EXCEPTION_OFFSET)
+#define AVALANCHE_INT_END_SECONDARY (32 + MIPS_EXCEPTION_OFFSET)
+
+#define AVALANCHE_INT_END_PRIMARY_REG1 (31 + MIPS_EXCEPTION_OFFSET)
+#define AVALANCHE_INT_END_PRIMARY_REG2 (39 + MIPS_EXCEPTION_OFFSET)
+
+
+#define AVALANCHE_INT_END (AVINTNUM(AVALANCHE_INT_END_PRIMARY) + \
+ AVINTNUM(AVALANCHE_INT_END_SECONDARY) \
+ + MIPS_EXCEPTION_OFFSET - 1) /* Suraj, check */
+
+
+/*
+ * Avalanche interrupt controller register base (primary)
+ */
+#define AVALANCHE_ICTRL_REGS_BASE AVALANCHE_INTC_BASE
+
+/******************************************************************************
+ * Avalanche exception controller register base (secondary)
+ ******************************************************************************/
+#define AVALANCHE_ECTRL_REGS_BASE (AVALANCHE_ICTRL_REGS_BASE + 0x80)
+
+
+/******************************************************************************
+ * Avalanche Interrupt pacing register base (secondary)
+ ******************************************************************************/
+#define AVALANCHE_IPACE_REGS_BASE (AVALANCHE_ICTRL_REGS_BASE + 0xA0)
+
+
+
+/******************************************************************************
+ * Avalanche Interrupt Channel Control register base
+ *****************************************************************************/
+#define AVALANCHE_CHCTRL_REGS_BASE (AVALANCHE_ICTRL_REGS_BASE + 0x200)
+
+
+struct avalanche_ictrl_regs /* Avalanche Interrupt control registers */
+{
+ volatile unsigned long intsr1; /* Interrupt Status/Set Register 1 0x00 */
+ volatile unsigned long intsr2; /* Interrupt Status/Set Register 2 0x04 */
+ volatile unsigned long unused1; /*0x08 */
+ volatile unsigned long unused2; /*0x0C */
+ volatile unsigned long intcr1; /* Interrupt Clear Register 1 0x10 */
+ volatile unsigned long intcr2; /* Interrupt Clear Register 2 0x14 */
+ volatile unsigned long unused3; /*0x18 */
+ volatile unsigned long unused4; /*0x1C */
+ volatile unsigned long intesr1; /* Interrupt Enable (Set) Register 1 0x20 */
+ volatile unsigned long intesr2; /* Interrupt Enable (Set) Register 2 0x24 */
+ volatile unsigned long unused5; /*0x28 */
+ volatile unsigned long unused6; /*0x2C */
+ volatile unsigned long intecr1; /* Interrupt Enable Clear Register 1 0x30 */
+ volatile unsigned long intecr2; /* Interrupt Enable Clear Register 2 0x34 */
+ volatile unsigned long unused7; /* 0x38 */
+ volatile unsigned long unused8; /* 0x3c */
+ volatile unsigned long pintir; /* Priority Interrupt Index Register 0x40 */
+ volatile unsigned long intmsr; /* Priority Interrupt Mask Index Reg 0x44 */
+ volatile unsigned long unused9; /* 0x48 */
+ volatile unsigned long unused10; /* 0x4C */
+ volatile unsigned long intpolr1; /* Interrupt Polarity Mask register 10x50 */
+ volatile unsigned long intpolr2; /* Interrupt Polarity Mask register 20x54 */
+ volatile unsigned long unused11; /* 0x58 */
+ volatile unsigned long unused12; /*0x5C */
+ volatile unsigned long inttypr1; /* Interrupt Type Mask register 10x60 */
+ volatile unsigned long inttypr2; /* Interrupt Type Mask register 20x64 */
+};
+
+struct avalanche_exctrl_regs /* Avalanche Exception control registers */
+{
+ volatile unsigned long exsr; /* Exceptions Status/Set register 0x80 */
+ volatile unsigned long reserved; /*0x84 */
+ volatile unsigned long excr; /* Exceptions Clear Register 0x88 */
+ volatile unsigned long reserved1; /*0x8c */
+ volatile unsigned long exiesr; /* Exceptions Interrupt Enable (set) 0x90 */
+ volatile unsigned long reserved2; /*0x94 */
+ volatile unsigned long exiecr; /* Exceptions Interrupt Enable(clear)0x98 */
+};
+struct avalanche_ipace_regs
+{
+
+ volatile unsigned long ipacep; /* Interrupt pacing register 0xa0 */
+ volatile unsigned long ipacemap; /*Interrupt Pacing Map Register 0xa4 */
+ volatile unsigned long ipacemax; /*Interrupt Pacing Max Register 0xa8 */
+};
+struct avalanche_channel_int_number
+{
+ volatile unsigned long cintnr0; /* Channel Interrupt Number Register0x200 */
+ volatile unsigned long cintnr1; /* Channel Interrupt Number Register0x204 */
+ volatile unsigned long cintnr2; /* Channel Interrupt Number Register0x208 */
+ volatile unsigned long cintnr3; /* Channel Interrupt Number Register0x20C */
+ volatile unsigned long cintnr4; /* Channel Interrupt Number Register0x210 */
+ volatile unsigned long cintnr5; /* Channel Interrupt Number Register0x214 */
+ volatile unsigned long cintnr6; /* Channel Interrupt Number Register0x218 */
+ volatile unsigned long cintnr7; /* Channel Interrupt Number Register0x21C */
+ volatile unsigned long cintnr8; /* Channel Interrupt Number Register0x220 */
+ volatile unsigned long cintnr9; /* Channel Interrupt Number Register0x224 */
+ volatile unsigned long cintnr10; /* Channel Interrupt Number Register0x228 */
+ volatile unsigned long cintnr11; /* Channel Interrupt Number Register0x22C */
+ volatile unsigned long cintnr12; /* Channel Interrupt Number Register0x230 */
+ volatile unsigned long cintnr13; /* Channel Interrupt Number Register0x234 */
+ volatile unsigned long cintnr14; /* Channel Interrupt Number Register0x238 */
+ volatile unsigned long cintnr15; /* Channel Interrupt Number Register0x23C */
+ volatile unsigned long cintnr16; /* Channel Interrupt Number Register0x240 */
+ volatile unsigned long cintnr17; /* Channel Interrupt Number Register0x244 */
+ volatile unsigned long cintnr18; /* Channel Interrupt Number Register0x248 */
+ volatile unsigned long cintnr19; /* Channel Interrupt Number Register0x24C */
+ volatile unsigned long cintnr20; /* Channel Interrupt Number Register0x250 */
+ volatile unsigned long cintnr21; /* Channel Interrupt Number Register0x254 */
+ volatile unsigned long cintnr22; /* Channel Interrupt Number Register0x358 */
+ volatile unsigned long cintnr23; /* Channel Interrupt Number Register0x35C */
+ volatile unsigned long cintnr24; /* Channel Interrupt Number Register0x260 */
+ volatile unsigned long cintnr25; /* Channel Interrupt Number Register0x264 */
+ volatile unsigned long cintnr26; /* Channel Interrupt Number Register0x268 */
+ volatile unsigned long cintnr27; /* Channel Interrupt Number Register0x26C */
+ volatile unsigned long cintnr28; /* Channel Interrupt Number Register0x270 */
+ volatile unsigned long cintnr29; /* Channel Interrupt Number Register0x274 */
+ volatile unsigned long cintnr30; /* Channel Interrupt Number Register0x278 */
+ volatile unsigned long cintnr31; /* Channel Interrupt Number Register0x27C */
+ volatile unsigned long cintnr32; /* Channel Interrupt Number Register0x280 */
+ volatile unsigned long cintnr33; /* Channel Interrupt Number Register0x284 */
+ volatile unsigned long cintnr34; /* Channel Interrupt Number Register0x288 */
+ volatile unsigned long cintnr35; /* Channel Interrupt Number Register0x28C */
+ volatile unsigned long cintnr36; /* Channel Interrupt Number Register0x290 */
+ volatile unsigned long cintnr37; /* Channel Interrupt Number Register0x294 */
+ volatile unsigned long cintnr38; /* Channel Interrupt Number Register0x298 */
+ volatile unsigned long cintnr39; /* Channel Interrupt Number Register0x29C */
+};
+
+struct avalanche_interrupt_line_to_channel
+{
+ unsigned long int_line0; /* Start of primary interrupts */
+ unsigned long int_line1;
+ unsigned long int_line2;
+ unsigned long int_line3;
+ unsigned long int_line4;
+ unsigned long int_line5;
+ unsigned long int_line6;
+ unsigned long int_line7;
+ unsigned long int_line8;
+ unsigned long int_line9;
+ unsigned long int_line10;
+ unsigned long int_line11;
+ unsigned long int_line12;
+ unsigned long int_line13;
+ unsigned long int_line14;
+ unsigned long int_line15;
+ unsigned long int_line16;
+ unsigned long int_line17;
+ unsigned long int_line18;
+ unsigned long int_line19;
+ unsigned long int_line20;
+ unsigned long int_line21;
+ unsigned long int_line22;
+ unsigned long int_line23;
+ unsigned long int_line24;
+ unsigned long int_line25;
+ unsigned long int_line26;
+ unsigned long int_line27;
+ unsigned long int_line28;
+ unsigned long int_line29;
+ unsigned long int_line30;
+ unsigned long int_line31;
+ unsigned long int_line32;
+ unsigned long int_line33;
+ unsigned long int_line34;
+ unsigned long int_line35;
+ unsigned long int_line36;
+ unsigned long int_line37;
+ unsigned long int_line38;
+ unsigned long int_line39;
+};
+
+
+/* Interrupt Line #'s (Sangam peripherals) */
+
+/*------------------------------*/
+/* Sangam primary interrupts */
+/*------------------------------*/
+
+#define UNIFIED_SECONDARY_INTERRUPT 0
+#define AVALANCHE_EXT_INT_0 1
+#define AVALANCHE_EXT_INT_1 2
+/* Line #3 Reserved */
+/* Line #4 Reserved */
+#define AVALANCHE_TIMER_0_INT 5
+#define AVALANCHE_TIMER_1_INT 6
+#define AVALANCHE_UART0_INT 7
+#define AVALANCHE_UART1_INT 8
+#define AVALANCHE_PDMA_INT0 9
+#define AVALANCHE_PDMA_INT1 10
+/* Line #11 Reserved */
+/* Line #12 Reserved */
+/* Line #13 Reserved */
+/* Line #14 Reserved */
+#define AVALANCHE_ATM_SAR_INT 15
+/* Line #16 Reserved */
+/* Line #17 Reserved */
+/* Line #18 Reserved */
+#define AVALANCHE_MAC0_INT 19
+/* Line #20 Reserved */
+#define AVALANCHE_VLYNQ0_INT 21
+#define AVALANCHE_CODEC_WAKE_INT 22
+/* Line #23 Reserved */
+#define AVALANCHE_USB_INT 24
+#define AVALANCHE_VLYNQ1_INT 25
+/* Line #26 Reserved */
+/* Line #27 Reserved */
+#define AVALANCHE_MAC1_INT 28
+#define AVALANCHE_I2CM_INT 29
+#define AVALANCHE_PDMA_INT2 30
+#define AVALANCHE_PDMA_INT3 31
+/* Line #32 Reserved */
+/* Line #33 Reserved */
+/* Line #34 Reserved */
+/* Line #35 Reserved */
+/* Line #36 Reserved */
+#define AVALANCHE_VDMA_VT_RX_INT 37
+#define AVALANCHE_VDMA_VT_TX_INT 38
+#define AVALANCHE_ADSLSS_INT 39
+
+/*-----------------------------------*/
+/* Sangam Secondary Interrupts */
+/*-----------------------------------*/
+#define PRIMARY_INTS 40
+
+#define EMIF_INT (7 + PRIMARY_INTS)
+
+
+extern void avalanche_int_set(int channel, int line);
+
+
+#endif /* _AVALANCHE_INTC_H */
diff -urN linux.old/include/asm-mips/ar7/avalanche_misc.h linux.dev/include/asm-mips/ar7/avalanche_misc.h
--- linux.old/include/asm-mips/ar7/avalanche_misc.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/include/asm-mips/ar7/avalanche_misc.h 2005-08-12 19:32:05.148223840 +0200
@@ -0,0 +1,174 @@
+#ifndef _AVALANCHE_MISC_H_
+#define _AVALANCHE_MISC_H_
+
+typedef enum AVALANCHE_ERR_t
+{
+ AVALANCHE_ERR_OK = 0, /* OK or SUCCESS */
+ AVALANCHE_ERR_ERROR = -1, /* Unspecified/Generic ERROR */
+
+ /* Pointers and args */
+ AVALANCHE_ERR_INVARG = -2, /* Invaild argument to the call */
+ AVALANCHE_ERR_NULLPTR = -3, /* NULL pointer */
+ AVALANCHE_ERR_BADPTR = -4, /* Bad (out of mem) pointer */
+
+ /* Memory issues */
+ AVALANCHE_ERR_ALLOC_FAIL = -10, /* allocation failed */
+ AVALANCHE_ERR_FREE_FAIL = -11, /* free failed */
+ AVALANCHE_ERR_MEM_CORRUPT = -12, /* corrupted memory */
+ AVALANCHE_ERR_BUF_LINK = -13, /* buffer linking failed */
+
+ /* Device issues */
+ AVALANCHE_ERR_DEVICE_TIMEOUT = -20, /* device timeout on read/write */
+ AVALANCHE_ERR_DEVICE_MALFUNC = -21, /* device malfunction */
+
+ AVALANCHE_ERR_INVID = -30 /* Invalid ID */
+
+} AVALANCHE_ERR;
+
+/*****************************************************************************
+ * Reset Control Module
+ *****************************************************************************/
+
+typedef enum AVALANCHE_RESET_MODULE_tag
+{
+ RESET_MODULE_UART0 = 0,
+ RESET_MODULE_UART1 = 1,
+ RESET_MODULE_I2C = 2,
+ RESET_MODULE_TIMER0 = 3,
+ RESET_MODULE_TIMER1 = 4,
+ RESET_MODULE_GPIO = 6,
+ RESET_MODULE_ADSLSS = 7,
+ RESET_MODULE_USBS = 8,
+ RESET_MODULE_SAR = 9,
+ RESET_MODULE_VDMA_VT = 11,
+ RESET_MODULE_FSER = 12,
+ RESET_MODULE_VLYNQ1 = 16,
+ RESET_MODULE_EMAC0 = 17,
+ RESET_MODULE_DMA = 18,
+ RESET_MODULE_BIST = 19,
+ RESET_MODULE_VLYNQ0 = 20,
+ RESET_MODULE_EMAC1 = 21,
+ RESET_MODULE_MDIO = 22,
+ RESET_MODULE_ADSLSS_DSP = 23,
+ RESET_MODULE_EPHY = 26
+} AVALANCHE_RESET_MODULE_T;
+
+typedef enum AVALANCHE_RESET_CTRL_tag
+{
+ IN_RESET = 0,
+ OUT_OF_RESET
+} AVALANCHE_RESET_CTRL_T;
+
+typedef enum AVALANCHE_SYS_RST_MODE_tag
+{
+ RESET_SOC_WITH_MEMCTRL = 1, /* SW0 bit in SWRCR register */
+ RESET_SOC_WITHOUT_MEMCTRL = 2 /* SW1 bit in SWRCR register */
+} AVALANCHE_SYS_RST_MODE_T;
+
+typedef enum AVALANCHE_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 */
+} AVALANCHE_SYS_RESET_STATUS_T;
+
+AVALANCHE_RESET_CTRL_T avalanche_get_reset_status(AVALANCHE_RESET_MODULE_T reset_module);
+void avalanche_sys_reset(AVALANCHE_SYS_RST_MODE_T mode);
+AVALANCHE_SYS_RESET_STATUS_T avalanche_get_sys_last_reset_status(void);
+
+typedef int (*REMOTE_VLYNQ_DEV_RESET_CTRL_FN)(unsigned int reset_module, AVALANCHE_RESET_CTRL_T reset_ctrl);
+
+/*****************************************************************************
+ * Power Control Module
+ *****************************************************************************/
+
+typedef enum AVALANCHE_POWER_CTRL_tag
+{
+ POWER_CTRL_POWER_UP = 0,
+ POWER_CTRL_POWER_DOWN
+} AVALANCHE_POWER_CTRL_T;
+
+typedef enum AVALANCHE_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 */
+} AVALANCHE_SYS_POWER_MODE_T;
+
+void avalanche_power_ctrl(unsigned int power_module, AVALANCHE_POWER_CTRL_T power_ctrl);
+AVALANCHE_POWER_CTRL_T avalanche_get_power_status(unsigned int power_module);
+void avalanche_set_global_power_mode(AVALANCHE_SYS_POWER_MODE_T power_mode);
+AVALANCHE_SYS_POWER_MODE_T avalanche_get_global_power_mode(void);
+
+/*****************************************************************************
+ * Wakeup Control
+ *****************************************************************************/
+
+typedef enum AVALANCHE_WAKEUP_INTERRUPT_tag
+{
+ WAKEUP_INT0 = 1,
+ WAKEUP_INT1 = 2,
+ WAKEUP_INT2 = 4,
+ WAKEUP_INT3 = 8
+} AVALANCHE_WAKEUP_INTERRUPT_T;
+
+typedef enum TNETV1050_WAKEUP_CTRL_tag
+{
+ WAKEUP_DISABLED = 0,
+ WAKEUP_ENABLED
+} AVALANCHE_WAKEUP_CTRL_T;
+
+typedef enum TNETV1050_WAKEUP_POLARITY_tag
+{
+ WAKEUP_ACTIVE_HIGH = 0,
+ WAKEUP_ACTIVE_LOW
+} AVALANCHE_WAKEUP_POLARITY_T;
+
+void avalanche_wakeup_ctrl(AVALANCHE_WAKEUP_INTERRUPT_T wakeup_int,
+ AVALANCHE_WAKEUP_CTRL_T wakeup_ctrl,
+ AVALANCHE_WAKEUP_POLARITY_T wakeup_polarity);
+
+/*****************************************************************************
+ * GPIO Control
+ *****************************************************************************/
+
+typedef enum AVALANCHE_GPIO_PIN_MODE_tag
+{
+ FUNCTIONAL_PIN = 0,
+ GPIO_PIN = 1
+} AVALANCHE_GPIO_PIN_MODE_T;
+
+typedef enum AVALANCHE_GPIO_PIN_DIRECTION_tag
+{
+ GPIO_OUTPUT_PIN = 0,
+ GPIO_INPUT_PIN = 1
+} AVALANCHE_GPIO_PIN_DIRECTION_T;
+
+typedef enum { GPIO_FALSE, GPIO_TRUE } AVALANCHE_GPIO_BOOL_T;
+
+void avalanche_gpio_init(void);
+int avalanche_gpio_ctrl(unsigned int gpio_pin,
+ AVALANCHE_GPIO_PIN_MODE_T pin_mode,
+ AVALANCHE_GPIO_PIN_DIRECTION_T pin_direction);
+int avalanche_gpio_ctrl_with_link_count(unsigned int gpio_pin,
+ AVALANCHE_GPIO_PIN_MODE_T pin_mode,
+ AVALANCHE_GPIO_PIN_DIRECTION_T pin_direction);
+int avalanche_gpio_out_bit(unsigned int gpio_pin, int value);
+int avalanche_gpio_in_bit(unsigned int gpio_pin);
+int avalanche_gpio_out_value(unsigned int out_val, unsigned int set_mask, unsigned int reg_index);
+int avalanche_gpio_out_value_with_link_count(unsigned int out_val, unsigned int set_mask, unsigned int reg_index);
+int avalanche_gpio_in_value(unsigned int *in_val, unsigned int reg_index);
+
+unsigned int avalanche_get_chip_version_info(void);
+
+unsigned int avalanche_get_vbus_freq(void);
+void avalanche_set_vbus_freq(unsigned int);
+
+
+typedef int (*SET_MDIX_ON_CHIP_FN_T)(unsigned int base_addr, unsigned int operation);
+int avalanche_set_mdix_on_chip(unsigned int base_addr, unsigned int operation);
+unsigned int avalanche_is_mdix_on_chip(void);
+
+#endif
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-08-12 19:32:05.149223688 +0200
@@ -0,0 +1,567 @@
+/*
+ * $Id$
+ * Avalanche Register Descriptions
+ *
+ * Jeff Harrell, jharrell@ti.com
+ * 2000 (c) Texas Instruments Inc.
+ */
+
+#ifndef __AVALANCHE_REGS_H
+#define __AVALANCHE_REGS_H
+
+#include <asm/addrspace.h>
+#include <linux/config.h>
+
+/*----------------------------------------*/
+/* Base offsets within the Avalanche ASIC */
+/*----------------------------------------*/
+
+#define BBIF_SPACE0 (KSEG1ADDR(0x01000000))
+#define BBIF_SPACE1 (KSEG1ADDR(0x01800000))
+#define BBIF_CONTROL (KSEG1ADDR(0x02000000))
+#define ATM_SAR_BASE (KSEG1ADDR(0x03000000))
+#define USB_MCU_BASE (KSEG1ADDR(0x03400000))
+#define DES_BASE (KSEG1ADDR(0x08600000))
+#define ETH_MACA_BASE (KSEG1ADDR(0x08610000))
+#define ETH_MACB_BASE (KSEG1ADDR(0x08612800))
+#define MEM_CTRLR_BASE (KSEG1ADDR(0x08610800))
+#define GPIO_BASE (KSEG1ADDR(0x08610900))
+#define CLK_CTRL_BASE (KSEG1ADDR(0x08610A00))
+#define WATCH_DOG_BASE (KSEG1ADDR(0x08610B00))
+#define TMR1_BASE (KSEG1ADDR(0x08610C00))
+#define TRM2_BASE (KSEG1ADDR(0x08610D00))
+#define UARTA_BASE (KSEG1ADDR(0x08610E00))
+#define UARTB_BASE (KSEG1ADDR(0x08610F00))
+#define I2C_BASE (KSEG1ADDR(0x08611000))
+#define DEV_ID_BASE (KSEG1ADDR(0x08611100))
+#define USB_BASE (KSEG1ADDR(0x08611200))
+#define PCI_CONFIG_BASE (KSEG1ADDR(0x08611300))
+#define DMA_BASE (KSEG1ADDR(0x08611400))
+#define RESET_CTRL_BASE (KSEG1ADDR(0x08611600))
+#define DSL_IF_BASE (KSEG1ADDR(0x08611B00))
+#define INT_CTL_BASE (KSEG1ADDR(0x08612400))
+#define PHY_BASE (KSEG1ADDR(0x1E000000))
+
+/*---------------------------------*/
+/* Device ID, chip version number */
+/*---------------------------------*/
+
+#define AVALANCHE_CHVN (*(volatile unsigned int *)(DEV_ID_BASE+0x14))
+#define AVALANCHE_DEVID1 (*(volatile unsigned int *)(DEV_ID_BASE+0x18))
+#define AVALANCHE_DEVID2 (*(volatile unsigned int *)(DEV_ID_BASE+0x1C))
+
+/*----------------------------------*/
+/* Reset Control VW changed to ptrs */
+/*----------------------------------*/
+
+#define AVALANCHE_PRCR (*(volatile unsigned int *)(RESET_CTRL_BASE + 0x0)) /* Peripheral reset control */
+#define AVALANCHE_SWRCR (*(volatile unsigned int *)(RESET_CTRL_BASE + 0x4)) /* Software reset control */
+#define AVALANCHE_RSR (*(volatile unsigned int *)(RESET_CTRL_BASE + 0x8)) /* Reset status register */
+
+/* reset control bits */
+
+#define AV_RST_UART0 (1<<0) /* Brings UART0 out of reset */
+#define AV_RST_UART1 (1<<1) /* Brings UART1 out of reset */
+#define AV_RST_IICM (1<<2) /* Brings the I2CM out of reset */
+#define AV_RST_TIMER0 (1<<3) /* Brings Timer 0 out of reset */
+#define AV_RST_TIMER1 (1<<4) /* Brings Timer 1 out of reset */
+#define AV_RST_DES (1<<5) /* Brings the DES module out of reset */
+#define AV_RST_GPIO (1<<6) /* Brings the GPIO module out of reset (see note below) */
+/*
+ JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE
+ If you reset the GPIO interface all of the directions (i/o) of the UART B
+ interface pins are inputs and must be reconfigured so as not to lose the
+ serial console interface
+ JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE
+*/
+#define AV_RST_BBIF (1<<7) /* Brings the Broadband interface out of reset */
+#define AV_RST_USB (1<<8) /* Brings the USB module out of reset */
+#define AV_RST_SAR (1<<9) /* Brings the SAR out of reset */
+#define AV_RST_HDLC (1<<10) /* Brings the HDLC module out of reset */
+#define AV_RST_PCI (1<<16) /* Brings the PCI module out of reset */
+#define AV_RST_ETH_MAC0 (1<<17) /* Brings the Ethernet MAC0 out of reset */
+#define AV_RST_PICO_DMA (1<<18) /* Brings the PICO DMA module out of reset */
+#define AV_RST_BIST (1<<19) /* Brings the BIST module out of reset */
+#define AV_RST_DSP (1<<20) /* Brings the DSP sub system out of reset */
+#define AV_RST_ETH_MAC1 (1<<21) /* Brings the Ethernet MAC1 out of reset */
+
+/*----------------------*/
+/* Physical interfaces */
+/*----------------------*/
+
+/* Phy loopback */
+#define PHY_LOOPBACK 1
+
+
+/* Phy 0 */
+#define PHY0BASE (PHY_BASE)
+#define PHY0RST (*(volatile unsigned char *) (PHY0BASE)) /* reset */
+#define PHY0CTRL (*(volatile unsigned char *) (PHY0BASE+0x5)) /* control */
+#define PHY0RACPCTRL (*(volatile unsigned char *) (PHY0BASE+0x50)) /* RACP control/status */
+#define PHY0TACPCTRL (*(volatile unsigned char *) (PHY0BASE+0x60)) /* TACP idle/unassigned cell hdr */
+#define PHY0RACPINT (*(volatile unsigned char *) (PHY0BASE+0x51)) /* RACP interrupt enable/Status */
+
+
+/* Phy 1 */
+
+#define PHY1BASE (PHY_BASE + 0x100000)
+#define PHY1RST (*(volatile unsigned char *) (PHY1BASE)) /* reset */
+#define PHY1CTRL (*(volatile unsigned char *) (PHY1BASE+0x5)) /* control */
+#define PHY1RACPCTRL (*(volatile unsigned char *) (PHY1BASE+0x50))
+#define PHY1TACPCTRL (*(volatile unsigned char *) (PHY1BASE+0x60))
+#define PHY1RACPINT (*(volatile unsigned char *) (PHY1BASE+0x51))
+
+/* Phy 2 */
+
+#define PHY2BASE (PHY_BASE + 0x200000)
+#define PHY2RST (*(volatile unsigned char *) (PHY2BASE)) /* reset */
+#define PHY2CTRL (*(volatile unsigned char *) (PHY2BASE+0x5)) /* control */
+#define PHY2RACPCTRL (*(volatile unsigned char *) (PHY2BASE+0x50))
+#define PHY2TACPCTRL (*(volatile unsigned char *) (PHY2BASE+0x60))
+#define PHY2RACPINT (*(volatile unsigned char *) (PHY2BASE+0x51))
+
+/*-------------------*/
+/* Avalanche ATM SAR */
+/*-------------------*/
+
+#define AVSAR_SYSCONFIG (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000000)) /* SAR system config register */
+#define AVSAR_SYSSTATUS (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000004)) /* SAR system status register */
+#define AVSAR_INT_ENABLE (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000008)) /* SAR interrupt enable register */
+#define AVSAR_CONN_VPI_VCI (*(volatile unsigned int*)(ATM_SAR_BASE+0x0000000c)) /* VPI/VCI connection config */
+#define AVSAR_CONN_CONFIG (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000010)) /* Connection config register */
+#define AVSAR_OAM_CONFIG (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000018)) /* OAM configuration register */
+
+/* Transmit completion ring registers */
+
+#define AVSAR_TCRAPTR (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000100))
+#define AVSAR_TCRASIZE (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000104))
+#define AVSAR_TCRAINTTHRESH (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000108))
+#define AVSAR_TCRATOTENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x0000010c))
+#define AVSAR_TCRAFREEENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000110))
+#define AVSAR_TCRAPENDENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000114))
+#define AVSAR_TCRAENTINC (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000118))
+#define AVSAR_TCRBPTR (*(volatile unsigned int *)(ATM_SAR_BASE+0x0000011c))
+#define AVSAR_TCRBSIZE (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000120))
+#define AVSAR_TCRBINTTHRESH (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000124))
+#define AVSAR_TCRBTOTENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000128))
+#define AVSAR_TCRBFREEENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x0000012c))
+#define AVSAR_TCRBPENDENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000130))
+#define AVSAR_TCRBENTINC (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000134))
+
+/* Transmit Queue Packet registers */
+#define AVSAR_TXQUEUE_PKT0 (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000140))
+#define AVSAR_TXQUEUE_PKT1 (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000144))
+#define AVSAR_TXQUEUE_PKT2 (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000148))
+#define AVSAR_TX_FLUSH (*(volatile unsigned int *)(ATM_SAR_BASE+0x0000014C))
+/* Receive completion ring registers */
+
+#define AVSAR_RCRAPTR (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000200))
+#define AVSAR_RCRASIZE (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000204))
+#define AVSAR_RCRAINTTHRESH (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000208))
+#define AVSAR_RCRATOTENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x0000020c))
+#define AVSAR_RCRAFREEENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000210))
+#define AVSAR_RCRAPENDENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000214))
+#define AVSAR_RCRAENTINC (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000218))
+#define AVSAR_RCRBPTR (*(volatile unsigned int *)(ATM_SAR_BASE+0x0000021c))
+#define AVSAR_RCRBSIZE (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000220))
+#define AVSAR_RCRBINTTHRESH (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000224))
+#define AVSAR_RCRBTOTENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000228))
+#define AVSAR_RCRBFREEENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x0000022c))
+#define AVSAR_RCRBPENDENT (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000230))
+#define AVSAR_RCRBENTINC (*(volatile unsigned int *)(ATM_SAR_BASE+0x00000234))
+
+#define AVSAR_RXFBL_ADD0 (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000240)) /* Rx Free buffer list add 0 */
+#define AVSAR_RXFBL_ADD1 (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000244)) /* Rx Free buffer list add 1 */
+#define AVSAR_RXFBL_ADD2 (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000248)) /* Rx Free buffer list add 2 */
+#define AVSAR_RXFBLSIZE_0 (*(volatile unsigned int*)(ATM_SAR_BASE+0x0000028c)) /* Rx Free buffer list size 0 */
+#define AVSAR_RXFBLSIZE_1 (*(volatile unsigned int*)(ATM_SAR_BASE+0x0000029c)) /* Rx Free buffer list size 1 */
+#define AVSAR_RXFBLSIZE_2 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000002ac)) /* Rx Free buffer list size 2 */
+#define AVSAR_RXFBLSIZE_3 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000002bc)) /* Rx Free buffer list size 3 */
+
+
+#if defined(CONFIG_MIPS_EVM3D) || defined(CONFIG_MIPS_AR5D01) || defined(CONFIG_MIPS_AR5W01)
+
+#define AVSAR_SAR_FREQUENCY (*(volatile unsigned int*)(ATM_SAR_BASE+0x00010480))
+#define AVSAR_OAM_CC_SINK (*(volatile unsigned int*)(ATM_SAR_BASE+0x00010484))
+#define AVSAR_OAM_AIS_RDI_RX (*(volatile unsigned int*)(ATM_SAR_BASE+0x00010488))
+#define AVSAR_OAM_CPID0 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104E0))
+#define AVSAR_OAM_LLID0 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104F0))
+#define AVSAR_OAM_CPID1 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104E4))
+#define AVSAR_OAM_LLID1 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104F4))
+#define AVSAR_OAM_CPID2 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104E8))
+#define AVSAR_OAM_LLID2 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104F8))
+#define AVSAR_OAM_CPID3 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104EC))
+#define AVSAR_OAM_LLID3 (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104FC))
+#define AVSAR_OAM_CORR_TAG (*(volatile unsigned int*)(ATM_SAR_BASE+0x00010500))
+#define AVSAR_OAM_FAR_COUNT (*(volatile unsigned int*)(ATM_SAR_BASE+0x00010520))
+#define AVSAR_OAM_NEAR_COUNT (*(volatile unsigned int*)(ATM_SAR_BASE+0x00010540))
+#define AVSAR_OAM_CONFIG_REG (*(volatile unsigned int*)(ATM_SAR_BASE+0x00000018))
+#define AVSAR_FAIRNESS_REG (*(volatile unsigned int*)(ATM_SAR_BASE+0x000104B8))
+#define AVSAR_UBR_PCR_REG (*(volatile unsigned int*)(ATM_SAR_BASE+0x00010490))
+
+
+/*
+
+#define OAM_CPID_ADD 0xa30104e0
+
+#define OAM_LLID_ADD 0xa30104f0
+
+#define OAM_LLID_VAL 0xffffffff
+
+#define OAM_CORR_TAG 0xa3010500
+
+#define OAM_FAR_COUNT_ADD 0xa3010520
+
+#define OAM_NEAR_COUNT_ADD 0xa3010540
+
+#define OAM_CONFIG_REG_ADD 0xa3000018
+*/
+
+
+#else /* CONFIG_MIPS_EVM3 || CONFIG_MIPS_ACPEP */
+
+#define AVSAR_SAR_FREQUENCY (*(volatile unsigned int*)(ATM_SAR_BASE+0x00012000))
+#define AVSAR_OAM_CC_SINK (*(volatile unsigned int*)(ATM_SAR_BASE+0x00012004))
+#define AVSAR_OAM_AIS_RDI_RX (*(volatile unsigned int*)(ATM_SAR_BASE+0x00012008))
+#define AVSAR_OAM_CPID (*(volatile unsigned int*)(ATM_SAR_BASE+0x00012300))
+
+#endif /* CONFIG_MIPS_EVM3D || CONFIG_MIPS_AR5D01 || CONFIG_MIPS_AR5W01 */
+
+
+#define AVSAR_STATE_RAM (ATM_SAR_BASE + 0x010000) /* SAR state RAM */
+#define AVSAR_PDSP_BASE (ATM_SAR_BASE + 0x020000) /* SAR PDSP base address */
+#define AVSAR_TXDMA_BASE (ATM_SAR_BASE + 0x030000) /* Transmit DMA state base */
+#define AVSAR_TDMASTATE6 0x18 /* Transmit DMA state word 6 */
+#define AVSAR_RXDMA_BASE (ATM_SAR_BASE + 0x040000) /* Receive DMA state base */
+#define AVSAR_RDMASTATE0 0x0 /* Receive DMA state word 0 */
+
+/*------------------------------------------*/
+/* DSL Interface */
+/*------------------------------------------*/
+
+#define AVDSL_TX_EN (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000000))
+#define AVDSL_RX_EN (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000004))
+#define AVDSL_POLL (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000008))
+
+/* Fast */
+
+#define AVDSL_TX_FIFO_ADDR0 (*(volatile unsigned int *)(DSL_IF_BASE + 0x0000000C))
+#define AVDSL_TX_FIFO_BASE0 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000010))
+#define AVDSL_TX_FIFO_LEN0 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000014))
+#define AVDSL_TX_FIFO_PR0 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000018))
+#define AVDSL_RX_FIFO_ADDR0 (*(volatile unsigned int *)(DSL_IF_BASE + 0x0000001C))
+#define AVDSL_RX_FIFO_BASE0 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000020))
+#define AVDSL_RX_FIFO_LEN0 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000024))
+#define AVDSL_RX_FIFO_PR0 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000028))
+
+/* Interleaved */
+
+#define AVDSL_TX_FIFO_ADDR1 (*(volatile unsigned int *)(DSL_IF_BASE + 0x0000002C))
+#define AVDSL_TX_FIFO_BASE1 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000030))
+#define AVDSL_TX_FIFO_LEN1 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000034))
+#define AVDSL_TX_FIFO_PR1 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000038))
+#define AVDSL_RX_FIFO_ADDR1 (*(volatile unsigned int *)(DSL_IF_BASE + 0x0000003C))
+#define AVDSL_RX_FIFO_BASE1 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000040))
+#define AVDSL_RX_FIFO_LEN1 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000044))
+#define AVDSL_RX_FIFO_PR1 (*(volatile unsigned int *)(DSL_IF_BASE + 0x00000048))
+
+/*------------------------------------------*/
+/* Broadband I/F */
+/*------------------------------------------*/
+
+#define AVBBIF_BBIF_CNTRL (*(volatile unsigned int *)(BBIF_CONTROL + 0x00000000))
+#define AVBBIF_ADDR_TRANS_0 (*(volatile unsigned int *)(BBIF_CONTROL + 0x00000004))
+#define AVBBIF_ADDR_TRANS_1 (*(volatile unsigned int *)(BBIF_CONTROL + 0x00000008))
+#define AVBBIF_ADDR_XB_MX_BL (*(volatile unsigned int *)(BBIF_CONTROL + 0x0000000C))
+#define AVBBIF_INFIFO_LVL (*(volatile unsigned int *)(BBIF_CONTROL + 0x00000010))
+#define AVBBIF_OUTFIFO_LVL (*(volatile unsigned int *)(BBIF_CONTROL + 0x00000014))
+
+#define AVBBIF_DISABLED 0x0
+#define AVBBIF_LBT4040_INT 0x1
+#define AVBBIF_XBUS 0x2
+#define AVBBIF_LBT4040_EXT 0x4
+
+#define AVBBIF_ADDR_MASK0 0xff000000 /* handles upper bits of BBIF 0 address */
+#define AVBBIF_ADDR_MASK1 0xff800000 /* handles upper bits of BBIF 1 address */
+#define AVBBIF_TRANS_MASK 0xff000000
+/*------------------------------------------*/
+/* GPIO I/F */
+/*------------------------------------------*/
+
+#define GPIO_DATA_INPUT (*(volatile unsigned int *)(GPIO_BASE + 0x00000000))
+#define GPIO_DATA_OUTPUT (*(volatile unsigned int *)(GPIO_BASE + 0x00000004))
+#define GPIO_DATA_DIR (*(volatile unsigned int *)(GPIO_BASE + 0x00000008)) /* 0=output 1=input */
+#define GPIO_DATA_ENABLE (*(volatile unsigned int *)(GPIO_BASE + 0x0000000C)) /* 0=GPIO Mux 1=GPIO */
+
+#define GPIO_0 (1<<21)
+#define GPIO_1 (1<<22)
+#define GPIO_2 (1<<23)
+#define GPIO_3 (1<<24)
+#define EINT_1 (1<<18)
+
+/*
+ JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE
+ If you reset the GPIO interface all of the directions (i/o) of the UART B
+ interface pins are inputs and must be reconfigured so as not to lose the
+ serial console interface
+ JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE JAH NOTE
+*/
+
+/*------------------------------------------*/
+/* CLK_CTRL */
+/*------------------------------------------*/
+#define PERIPH_CLK_CTL (*(volatile unsigned int *)(CLK_CTRL_BASE + 0x00000004))
+
+#define PCLK_0_HALF_VBUS (0<<16)
+#define PCLK_EQ_INPUT (1<<16)
+#define BBIF_CLK_HALF_VBUS (0<<17)
+#define BBIF_CLK_EQ_VBUS (1<<17)
+#define BBIF_CLK_EQ_BBCLK (3<<17)
+#define DSP_MODCLK_DSPCLKI (0<<20)
+#define DSP_MODCLK_REFCLKI (1<<20)
+#define USB_CLK_EQ_USBCLKI (0<<21)
+#define USB_CLK_EQ_REFCLKI (1<<21)
+
+/*------------------------------------------*/
+/* PCI Control Registers */
+/*------------------------------------------*/
+#define PCIC_CONTROL (*(volatile unsigned int *)(PCI_CONFIG_BASE))
+#define PCIC_CONTROL_CFG_DONE (1<<0)
+#define PCIC_CONTROL_DIS_SLAVE_TO (1<<1)
+#define PCIC_CONTROL_FORCE_DELAY_READ (1<<2)
+#define PCIC_CONTROL_FORCE_DELAY_READ_LINE (1<<3)
+#define PCIC_CONTROL_FORCE_DELAY_READ_MULT (1<<4)
+#define PCIC_CONTROL_MEM_SPACE_EN (1<<5)
+#define PCIC_CONTROL_MEM_MASK (1<<6)
+#define PCIC_CONTROL_IO_SPACE_EN (1<<7)
+#define PCIC_CONTROL_IO_MASK (1<<8)
+/* PCIC_CONTROL_RESERVED (1<<9) */
+#define PCIC_CONTROL_BASE0_EN (1<<10)
+#define PCIC_CONTROL_BASE1_EN (1<<11)
+#define PCIC_CONTROL_BASE2_EN (1<<12)
+#define PCIC_CONTROL_HOLD_MASTER_WRITE (1<<13)
+#define PCIC_CONTROL_ARBITER_EN (1<<14)
+#define PCIC_INT_SOURCE (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000004))
+#define PCIC_INT_SOURCE_PWR_MGMT (1<<0)
+#define PCIC_INT_SOURCE_PCI_TARGET (1<<1)
+#define PCIC_INT_SOURCE_PCI_MASTER (1<<2)
+#define PCIC_INT_SOURCE_POWER_WAKEUP (1<<3)
+#define PCIC_INT_SOURCE_PMEIN (1<<4)
+/* PCIC_INT_SOURCE_RESERVED (1<<5) */
+/* PCIC_INT_SOURCE_RESERVED (1<<6) */
+#define PCIC_INT_SOURCE_PIC_INTA (1<<7)
+#define PCIC_INT_SOURCE_PIC_INTB (1<<8)
+#define PCIC_INT_SOURCE_PIC_INTC (1<<9)
+#define PCIC_INT_SOURCE_PIC_INTD (1<<10)
+#define PCIC_INT_SOURCE_SOFT_INT0 (1<<11)
+#define PCIC_INT_SOURCE_SOFT_INT1 (1<<12)
+#define PCIC_INT_SOURCE_SOFT_INT2 (1<<13)
+#define PCIC_INT_SOURCE_SOFT_INT3 (1<<14)
+#define PCIC_INT_CLEAR (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000008))
+#define PCIC_INT_CLEAR_PM (1<<0)
+#define PCIC_INT_CLEAR_PCI_TARGET (1<<1)
+#define PCIC_INT_CLEAR_PCI_MASTER (1<<2)
+/* PCIC_INT_CLEAR_RESERVED (1<<3) */
+#define PCIC_INT_CLEAR_PMEIN (1<<4)
+/* PCIC_INT_CLEAR_RESERVED (1<<5) */
+/* PCIC_INT_CLEAR_RESERVED (1<<6) */
+#define PCIC_INT_CLEAR_PCI_INTA (1<<7)
+#define PCIC_INT_CLEAR_PCI_INTB (1<<8)
+#define PCIC_INT_CLEAR_PCI_INTC (1<<9)
+#define PCIC_INT_CLEAR_PCI_INTD (1<<10)
+#define PCIC_INT_CLEAR_SOFT_INT0 (1<<11)
+#define PCIC_INT_CLEAR_SOFT_INT1 (1<<12)
+#define PCIC_INT_CLEAR_SOFT_INT2 (1<<13)
+#define PCIC_INT_CLEAR_SOFT_INT3 (1<<14)
+#define PCIC_INT_EN_AVAL (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x0000000c))
+#define PCIC_INT_EN_AVAL_PM (1<<0)
+#define PCIC_INT_EN_AVAL_PCI_TARGET (1<<1)
+#define PCIC_INT_EN_AVAL_PCI_MASTER (1<<2)
+/* PCIC_INT_EN_AVAL_RESERVED (1<<3) */
+#define PCIC_INT_EN_AVAL_PMEIN (1<<4)
+/* PCIC_INT_EN_AVAL_RESERVED (1<<5) */
+/* PCIC_INT_EN_AVAL_RESERVED (1<<6) */
+#define PCIC_INT_EN_AVAL_PCI_INTA (1<<7)
+#define PCIC_INT_EN_AVAL_PCI_INTB (1<<8)
+#define PCIC_INT_EN_AVAL_PCI_INTC (1<<9)
+#define PCIC_INT_EN_AVAL_PCI_INTD (1<<10)
+#define PCIC_INT_EN_AVAL_SOFT_INT0 (1<<11)
+#define PCIC_INT_EN_AVAL_SOFT_INT1 (1<<12)
+#define PCIC_INT_EN_AVAL_SOFT_INT2 (1<<13)
+#define PCIC_INT_EN_AVAL_SOFT_INT3 (1<<14)
+#define PCIC_INT_EN_PCI (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000010))
+#define PCIC_INT_EN_PCI_PM (1<<0)
+#define PCIC_INT_EN_PCI_PCI_TARGET (1<<1)
+#define PCIC_INT_EN_PCI_PCI_MASTER (1<<2)
+/* PCIC_INT_EN_PCI_RESERVED (1<<3) */
+#define PCIC_INT_EN_PCI_PMEIN (1<<4)
+/* PCIC_INT_EN_PCI_RESERVED (1<<5) */
+/* PCIC_INT_EN_PCI_RESERVED (1<<6) */
+#define PCIC_INT_EN_PCI_PCI_INTA (1<<7)
+#define PCIC_INT_EN_PCI_PCI_INTB (1<<8)
+#define PCIC_INT_EN_PCI_PCI_INTC (1<<9)
+#define PCIC_INT_EN_PCI_PCI_INTD (1<<10)
+#define PCIC_INT_EN_PCI_SOFT_INT0 (1<<11)
+#define PCIC_INT_EN_PCI_SOFT_INT1 (1<<12)
+#define PCIC_INT_EN_PCI_SOFT_INT2 (1<<13)
+#define PCIC_INT_EN_PCI_SOFT_INT3 (1<<14)
+#define PCIC_INT_SWSET (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000014))
+#define PCIC_INT_SWSET_SOFT_INT0 (1<<0)
+#define PCIC_INT_SWSET_SOFT_INT1 (1<<1)
+#define PCIC_INT_SWSET_SOFT_INT2 (1<<2)
+#define PCIC_INT_SWSET_SOFT_INT3 (1<<3)
+#define PCIC_PM_CTL (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000018))
+#define PCIC_PM_CTL_PWR_STATE_MASK (0x02)
+/* PCIC_PM_CTL_RESERVED (1<<2) */
+/* PCIC_PM_CTL_RESERVED (1<<3) */
+/* PCIC_PM_CTL_RESERVED (1<<4) */
+/* PCIC_PM_CTL_RESERVED (1<<5) */
+/* PCIC_PM_CTL_RESERVED (1<<6) */
+/* PCIC_PM_CTL_RESERVED (1<<7) */
+/* PCIC_PM_CTL_RESERVED (1<<8) */
+/* PCIC_PM_CTL_RESERVED (1<<9) */
+#define PCIC_PM_CTL_PWR_SUPPORT (1<<10)
+#define PCIC_PM_CTL_PMEIN (1<<11)
+#define PCIC_PM_CTL_CAP_MASK (*(volatile unsigned short int *)(PCI_CONFIG_BASE + 0x0000001a))
+#define PCIC_PM_CONSUME (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x0000001c))
+#define PCIC_PM_CONSUME_D0 (*(volatile unsigned char *)(PCI_CONFIG_BASE + 0x0000001c))
+#define PCIC_PM_CONSUME_D1 (*(volatile unsigned char *)(PCI_CONFIG_BASE + 0x0000001d))
+#define PCIC_PM_CONSUME_D2 (*(volatile unsigned char *)(PCI_CONFIG_BASE + 0x0000001e))
+#define PCIC_PM_CONSUME_D3 (*(volatile unsigned char *)(PCI_CONFIG_BASE + 0x0000001f))
+#define PCIC_PM_DISSAPATED (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000020))
+#define PCIC_PM_DISSAPATED_D0 (*(volatile unsigned char *)(PCI_CONFIG_BASE + 0x00000020))
+#define PCIC_PM_DISSAPATED_D1 (*(volatile unsigned char *)(PCI_CONFIG_BASE + 0x00000021))
+#define PCIC_PM_DISSAPATED_D2 (*(volatile unsigned char *)(PCI_CONFIG_BASE + 0x00000022))
+#define PCIC_PM_DISSAPATED_D3 (*(volatile unsigned char *)(PCI_CONFIG_BASE + 0x00000023))
+#define PCIC_PM_DATA_SCALE (*(volatile unsigned short int *)(PCI_CONFIG_BASE + 0x00000024))
+#define PCIC_VEND_DEV_ID (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000028))
+#define PCIC_SUB_VEND_DEV_ID (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x0000002c))
+#define PCIC_CLASS_REV_ID (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000030))
+#define PCIC_MAX_MIN (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000034))
+#define PCIC_MAST_MEM_AT0 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x0000003c))
+#define PCIC_MAST_MEM_AT1 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000040))
+#define PCIC_MAST_MEM_AT2 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000044))
+#define PCIC_SLAVE_MASK0 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x0000004c))
+#define PCIC_SLAVE_MASK1 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000050))
+#define PCIC_SLAVE_MASK2 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000054))
+#define PCIC_SLAVE_BASE_AT0 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000058))
+#define PCIC_SLAVE_BASE_AT1 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x0000005c))
+#define PCIC_SLAVE_BASE_AT2 (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000060))
+#define PCIC_CONF_COMMAND (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000090))
+#define PCIC_CONF_ADDR (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000094))
+#define PCIC_CONF_DATA (*(volatile unsigned int *)(PCI_CONFIG_BASE + 0x00000098))
+
+/*------------------------------------------*/
+/* IIC_INTERFACE */
+/*------------------------------------------*/
+#define I2C_DATA_HI (*(volatile unsigned int *)(I2C_BASE + 0x0))
+#define I2C_DATA_LOW (*(volatile unsigned int *)(I2C_BASE + 0x4))
+#define I2C_CONFIG (*(volatile unsigned int *)(I2C_BASE + 0x8))
+#define I2C_DATA_READ (*(volatile unsigned int *)(I2C_BASE + 0xC))
+#define I2C_CLOCK_DIV (*(volatile unsigned int *)(I2C_BASE + 0x10))
+
+#define I2CWRITE 0x200
+#define I2CREAD 0x300
+#define I2C_END_BURST 0x400
+
+/* read bits */
+#define I2C_READ_ERROR 0x8000
+#define I2C_READ_COMPLETE 0x4000
+#define I2C_READ_BUSY 0x2000
+
+/* device types */
+#define I2C_IO_EXPANDER 0x2
+#define I2C_RTC 0xd
+
+/* device Addresses on I2C bus (EVM3) */
+#define SEVEN_SEGMENT_DISP 0x23 /* Device type = 0x2, Addr = 3 */
+#define EVM3_RTC 0xd0 /* Device type = 0xd, Addr = 0 */
+#define EVM3_RTC_I2C_ADDR 0x0
+
+/*------------------------------------------*/
+/* Ethernet MAC register offset definitions */
+/*------------------------------------------*/
+#define VMAC_DMACONFIG(X) (*(volatile unsigned int *)(X + 0x00000000))
+#define VMAC_INTSTS(X) (*(volatile unsigned int *)(X + 0x00000004))
+#define VMAC_INTMASK(X) (*(volatile unsigned int *)(X + 0x00000008))
+
+#define VMAC_WRAPCLK(X) (*(volatile unsigned int *)(X + 0x00000340))
+#define VMAC_STATSBASE(X) (*(volatile unsigned int *)(X + 0x00000400))
+
+#define VMAC_TCRPTR(X) (*(volatile unsigned int *)(X + 0x00000100))
+#define VMAC_TCRSIZE(X) (*(volatile unsigned int *)(X + 0x00000104))
+#define VMAC_TCRINTTHRESH(X) (*(volatile unsigned int *)(X + 0x00000108))
+#define VMAC_TCRTOTENT(X) (*(volatile unsigned int *)(X + 0x0000010C))
+#define VMAC_TCRFREEENT(X) (*(volatile unsigned int *)(X + 0x00000110))
+#define VMAC_TCRPENDENT(X) (*(volatile unsigned int *)(X + 0x00000114))
+#define VMAC_TCRENTINC(X) (*(volatile unsigned int *)(X + 0x00000118))
+#define VMAC_TXISRPACE(X) (*(volatile unsigned int *)(X + 0x0000011c))
+
+
+#define VMAC_TDMASTATE0(X) (*(volatile unsigned int *)(X + 0x00000120))
+#define VMAC_TDMASTATE1(X) (*(volatile unsigned int *)(X + 0x00000124))
+#define VMAC_TDMASTATE2(X) (*(volatile unsigned int *)(X + 0x00000128))
+#define VMAC_TDMASTATE3(X) (*(volatile unsigned int *)(X + 0x0000012C))
+#define VMAC_TDMASTATE4(X) (*(volatile unsigned int *)(X + 0x00000130))
+#define VMAC_TDMASTATE5(X) (*(volatile unsigned int *)(X + 0x00000134))
+#define VMAC_TDMASTATE6(X) (*(volatile unsigned int *)(X + 0x00000138))
+#define VMAC_TDMASTATE7(X) (*(volatile unsigned int *)(X + 0x0000013C))
+#define VMAC_TXPADDCNT(X) (*(volatile unsigned int *)(X + 0x00000140))
+#define VMAC_TXPADDSTART(X) (*(volatile unsigned int *)(X + 0x00000144))
+#define VMAC_TXPADDEND(X) (*(volatile unsigned int *)(X + 0x00000148))
+#define VMAC_TXQFLUSH(X) (*(volatile unsigned int *)(X + 0x0000014C))
+
+#define VMAC_RCRPTR(X) (*(volatile unsigned int *)(X + 0x00000200))
+#define VMAC_RCRSIZE(X) (*(volatile unsigned int *)(X + 0x00000204))
+#define VMAC_RCRINTTHRESH(X) (*(volatile unsigned int *)(X + 0x00000208))
+#define VMAC_RCRTOTENT(X) (*(volatile unsigned int *)(X + 0x0000020C))
+#define VMAC_RCRFREEENT(X) (*(volatile unsigned int *)(X + 0x00000210))
+#define VMAC_RCRPENDENT(X) (*(volatile unsigned int *)(X + 0x00000214))
+#define VMAC_RCRENTINC(X) (*(volatile unsigned int *)(X + 0x00000218))
+#define VMAC_RXISRPACE(X) (*(volatile unsigned int *)(X + 0x0000021c))
+
+#define VMAC_RDMASTATE0(X) (*(volatile unsigned int *)(X + 0x00000220))
+#define VMAC_RDMASTATE1(X) (*(volatile unsigned int *)(X + 0x00000224))
+#define VMAC_RDMASTATE2(X) (*(volatile unsigned int *)(X + 0x00000228))
+#define VMAC_RDMASTATE3(X) (*(volatile unsigned int *)(X + 0x0000022C))
+#define VMAC_RDMASTATE4(X) (*(volatile unsigned int *)(X + 0x00000230))
+#define VMAC_RDMASTATE5(X) (*(volatile unsigned int *)(X + 0x00000234))
+#define VMAC_RDMASTATE6(X) (*(volatile unsigned int *)(X + 0x00000238))
+#define VMAC_RDMASTATE7(X) (*(volatile unsigned int *)(X + 0x0000023C))
+#define VMAC_FBLADDCNT(X) (*(volatile unsigned int *)(X + 0x00000240))
+#define VMAC_FBLADDSTART(X) (*(volatile unsigned int *)(X + 0x00000244))
+#define VMAC_FBLADDEND(X) (*(volatile unsigned int *)(X + 0x00000248))
+#define VMAC_RXONOFF(X) (*(volatile unsigned int *)(X + 0x0000024C))
+
+#define VMAC_FBL0NEXTD(X) (*(volatile unsigned int *)(X + 0x00000280))
+#define VMAC_FBL0LASTD(X) (*(volatile unsigned int *)(X + 0x00000284))
+#define VMAC_FBL0COUNTD(X) (*(volatile unsigned int *)(X + 0x00000288))
+#define VMAC_FBL0BUFSIZE(X) (*(volatile unsigned int *)(X + 0x0000028C))
+
+#define VMAC_MACCONTROL(X) (*(volatile unsigned int *)(X + 0x00000300))
+#define VMAC_MACSTATUS(X) (*(volatile unsigned int *)(X + 0x00000304))
+#define VMAC_MACADDRHI(X) (*(volatile unsigned int *)(X + 0x00000308))
+#define VMAC_MACADDRLO(X) (*(volatile unsigned int *)(X + 0x0000030C))
+#define VMAC_MACHASH1(X) (*(volatile unsigned int *)(X + 0x00000310))
+#define VMAC_MACHASH2(X) (*(volatile unsigned int *)(X + 0x00000314))
+
+#define VMAC_WRAPCLK(X) (*(volatile unsigned int *)(X + 0x00000340))
+#define VMAC_BOFTEST(X) (*(volatile unsigned int *)(X + 0x00000344))
+#define VMAC_PACTEST(X) (*(volatile unsigned int *)(X + 0x00000348))
+#define VMAC_PAUSEOP(X) (*(volatile unsigned int *)(X + 0x0000034C))
+
+#define VMAC_MDIOCONTROL(X) (*(volatile unsigned int *)(X + 0x00000380))
+#define VMAC_MDIOUSERACCESS(X) (*(volatile unsigned int *)(X +0x00000384))
+#define VMAC_MDIOACK(X) (*(volatile unsigned int *)(X + 0x00000388))
+#define VMAC_MDIOLINK(X) (*(volatile unsigned int *)(X + 0x0000038C))
+#define VMAC_MDIOMACPHY(X) (*(volatile unsigned int *)(X + 0x00000390))
+
+#define VMAC_STATS_BASE(X) (X + 0x00000400)
+
+#endif __AVALANCHE_REGS_H
+
+
+
+
+
+
diff -urN linux.old/include/asm-mips/ar7/if_port.h linux.dev/include/asm-mips/ar7/if_port.h
--- linux.old/include/asm-mips/ar7/if_port.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/include/asm-mips/ar7/if_port.h 2005-08-12 19:32:05.149223688 +0200
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * FILE PURPOSE: Interface port id Header file
+ *******************************************************************************
+ * FILE NAME: if_port.h
+ *
+ * DESCRIPTION: Header file carrying information about port ids of interfaces
+ *
+ *
+ * (C) Copyright 2003, Texas Instruments, Inc
+ ******************************************************************************/
+#ifndef _IF_PORT_H_
+#define _IF_PORT_H_
+
+#define AVALANCHE_CPMAC_LOW_PORT_ID 0
+#define AVALANCHE_CPMAC_HIGH_PORT_ID 1
+#define AVALANCHE_USB_PORT_ID 2
+#define AVALANCHE_WLAN_PORT_ID 3
+
+
+#define AVALANCHE_MARVELL_BASE_PORT_ID 4
+
+/* The marvell ports occupy port ids from 4 to 8 */
+/* so the next port id number should start at 9 */
+
+
+#endif /* _IF_PORT_H_ */
diff -urN linux.old/include/asm-mips/ar7/sangam_boards.h linux.dev/include/asm-mips/ar7/sangam_boards.h
--- linux.old/include/asm-mips/ar7/sangam_boards.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/include/asm-mips/ar7/sangam_boards.h 2005-08-12 19:32:05.150223536 +0200
@@ -0,0 +1,77 @@
+#ifndef _SANGAM_BOARDS_H
+#define _SANGAM_BOARDS_H
+
+// Let us define board specific information here.
+
+
+#if defined(CONFIG_AR7DB)
+
+#define AFECLK_FREQ 35328000
+#define REFCLK_FREQ 25000000
+#define OSC3_FREQ 24000000
+#define AVALANCHE_LOW_CPMAC_PHY_MASK 0x80000000
+#define AVALANCHE_HIGH_CPMAC_PHY_MASK 0x55555555
+#define AVALANCHE_LOW_CPMAC_MDIX_MASK 0x80000000
+
+#endif
+
+
+#if defined(CONFIG_AR7RD)
+#define AFECLK_FREQ 35328000
+#define REFCLK_FREQ 25000000
+#define OSC3_FREQ 24000000
+#define AVALANCHE_LOW_CPMAC_PHY_MASK 0x80000000
+#define AVALANCHE_HIGH_CPMAC_PHY_MASK 0x2
+#define AVALANCHE_LOW_CPMAC_MDIX_MASK 0x80000000
+#endif
+
+
+#if defined(CONFIG_AR7WI)
+#define AFECLK_FREQ 35328000
+#define REFCLK_FREQ 25000000
+#define OSC3_FREQ 24000000
+#define AVALANCHE_LOW_CPMAC_PHY_MASK 0x80000000
+#define AVALANCHE_HIGH_CPMAC_PHY_MASK 0x2
+#define AVALANCHE_LOW_CPMAC_MDIX_MASK 0x80000000
+#endif
+
+
+#if defined(CONFIG_AR7V)
+#define AFECLK_FREQ 35328000
+#define REFCLK_FREQ 25000000
+#define OSC3_FREQ 24000000
+#define AVALANCHE_LOW_CPMAC_PHY_MASK 0x80000000
+#define AVALANCHE_HIGH_CPMAC_PHY_MASK 0x2
+#define AVALANCHE_LOW_CPMAC_MDIX_MASK 0x80000000
+#endif
+
+
+#if defined(CONFIG_AR7WRD)
+#define AFECLK_FREQ 35328000
+#define REFCLK_FREQ 25000000
+#define OSC3_FREQ 24000000
+#define AVALANCHE_LOW_CPMAC_PHY_MASK 0x80000000
+#define AVALANCHE_HIGH_CPMAC_PHY_MASK 0x00010000
+#define AVALANCHE_LOW_CPMAC_MDIX_MASK 0x80000000
+#endif
+
+
+#if defined(CONFIG_AR7VWI)
+#define AFECLK_FREQ 35328000
+#define REFCLK_FREQ 25000000
+#define OSC3_FREQ 24000000
+#define AVALANCHE_LOW_CPMAC_PHY_MASK 0x80000000
+#define AVALANCHE_HIGH_CPMAC_PHY_MASK 0x00010000
+#define AVALANCHE_LOW_CPMAC_MDIX_MASK 0x80000000
+#endif
+
+
+#if defined CONFIG_SEAD2
+#define AVALANCHE_LOW_CPMAC_PHY_MASK 0xAAAAAAAA
+#define AVALANCHE_HIGH_CPMAC_PHY_MASK 0x55555555
+#define AVALANCHE_LOW_CPMAC_MDIX_MASK 0
+#include <asm/mips-boards/sead.h>
+#endif
+
+
+#endif
diff -urN linux.old/include/asm-mips/ar7/sangam.h linux.dev/include/asm-mips/ar7/sangam.h
--- linux.old/include/asm-mips/ar7/sangam.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/include/asm-mips/ar7/sangam.h 2005-08-12 19:32:05.150223536 +0200
@@ -0,0 +1,180 @@
+#ifndef _SANGAM_H_
+#define _SANGAM_H_
+
+#include <linux/config.h>
+#include <asm/addrspace.h>
+
+/*----------------------------------------------------
+ * Sangam's Module Base Addresses
+ *--------------------------------------------------*/
+#define AVALANCHE_ADSL_SUB_SYS_MEM_BASE (KSEG1ADDR(0x01000000)) /* AVALANCHE ADSL Mem Base */
+#define AVALANCHE_BROADBAND_INTERFACE__BASE (KSEG1ADDR(0x02000000)) /* AVALANCHE BBIF */
+#define AVALANCHE_ATM_SAR_BASE (KSEG1ADDR(0x03000000)) /* AVALANCHE ATM SAR */
+#define AVALANCHE_USB_SLAVE_BASE (KSEG1ADDR(0x03400000)) /* AVALANCHE USB SLAVE */
+#define AVALANCHE_LOW_VLYNQ_MEM_MAP_BASE (KSEG1ADDR(0x04000000)) /* AVALANCHE VLYNQ 0 Mem map */
+#define AVALANCHE_LOW_CPMAC_BASE (KSEG1ADDR(0x08610000)) /* AVALANCHE CPMAC 0 */
+#define AVALANCHE_EMIF_CONTROL_BASE (KSEG1ADDR(0x08610800)) /* AVALANCHE EMIF */
+#define AVALANCHE_GPIO_BASE (KSEG1ADDR(0x08610900)) /* AVALANCHE GPIO */
+#define AVALANCHE_CLOCK_CONTROL_BASE (KSEG1ADDR(0x08610A00)) /* AVALANCHE Clock Control */
+#define AVALANCHE_WATCHDOG_TIMER_BASE (KSEG1ADDR(0x08610B00)) /* AVALANCHE Watch Dog Timer */
+#define AVALANCHE_TIMER0_BASE (KSEG1ADDR(0x08610C00)) /* AVALANCHE Timer 1 */
+#define AVALANCHE_TIMER1_BASE (KSEG1ADDR(0x08610D00)) /* AVALANCHE Timer 2 */
+#define AVALANCHE_UART0_REGS_BASE (KSEG1ADDR(0x08610E00)) /* AVALANCHE UART 0 */
+#define AVALANCHE_UART1_REGS_BASE (KSEG1ADDR(0x08610F00)) /* AVALANCHE UART 0 */
+#define AVALANCHE_I2C_BASE (KSEG1ADDR(0x08611000)) /* AVALANCHE I2C */
+#define AVALANCHE_USB_SLAVE_CONTROL_BASE (KSEG1ADDR(0x08611200)) /* AVALANCHE USB DMA */
+#define AVALANCHE_MCDMA0_CTRL_BASE (KSEG1ADDR(0x08611400)) /* AVALANCHE MC DMA 0 (channels 0-3) */
+#define AVALANCHE_RESET_CONTROL_BASE (KSEG1ADDR(0x08611600)) /* AVALANCHE Reset Control */
+#define AVALANCHE_BIST_CONTROL_BASE (KSEG1ADDR(0x08611700)) /* AVALANCHE BIST Control */
+#define AVALANCHE_LOW_VLYNQ_CONTROL_BASE (KSEG1ADDR(0x08611800)) /* AVALANCHE VLYNQ0 Control */
+#define AVALANCHE_DEVICE_CONFIG_LATCH_BASE (KSEG1ADDR(0x08611A00)) /* AVALANCHE Device Config Latch */
+#define AVALANCHE_HIGH_VLYNQ_CONTROL_BASE (KSEG1ADDR(0x08611C00)) /* AVALANCHE VLYNQ1 Control */
+#define AVALANCHE_MDIO_BASE (KSEG1ADDR(0x08611E00)) /* AVALANCHE MDIO */
+#define AVALANCHE_FSER_BASE (KSEG1ADDR(0x08612000)) /* AVALANCHE FSER base */
+#define AVALANCHE_INTC_BASE (KSEG1ADDR(0x08612400)) /* AVALANCHE INTC */
+#define AVALANCHE_HIGH_CPMAC_BASE (KSEG1ADDR(0x08612800)) /* AVALANCHE CPMAC 1 */
+#define AVALANCHE_HIGH_VLYNQ_MEM_MAP_BASE (KSEG1ADDR(0x0C000000)) /* AVALANCHE VLYNQ 1 Mem map */
+
+#define AVALANCHE_SDRAM_BASE 0x14000000UL
+
+
+/*----------------------------------------------------
+ * Sangam Interrupt Map (Primary Interrupts)
+ *--------------------------------------------------*/
+
+#define AVALANCHE_UNIFIED_SECONDARY_INT 0
+#define AVALANCHE_EXT_INT_0 1
+#define AVALANCHE_EXT_INT_1 2
+/* Line# 3 to 4 are reserved */
+#define AVALANCHE_TIMER_0_INT 5
+#define AVALANCHE_TIMER_1_INT 6
+#define AVALANCHE_UART0_INT 7
+#define AVALANCHE_UART1_INT 8
+#define AVALANCHE_DMA_INT0 9
+#define AVALANCHE_DMA_INT1 10
+/* Line# 11 to 14 are reserved */
+#define AVALANCHE_ATM_SAR_INT 15
+/* Line# 16 to 18 are reserved */
+#define AVALANCHE_LOW_CPMAC_INT 19
+/* Line# 20 is reserved */
+#define AVALANCHE_LOW_VLYNQ_INT 21
+#define AVALANCHE_CODEC_WAKEUP_INT 22
+/* Line# 23 is reserved */
+#define AVALANCHE_USB_SLAVE_INT 24
+#define AVALANCHE_HIGH_VLYNQ_INT 25
+/* Line# 26 to 27 are reserved */
+#define AVALANCHE_UNIFIED_PHY_INT 28
+#define AVALANCHE_I2C_INT 29
+#define AVALANCHE_DMA_INT2 30
+#define AVALANCHE_DMA_INT3 31
+/* Line# 32 is reserved */
+#define AVALANCHE_HIGH_CPMAC_INT 33
+/* Line# 34 to 36 is reserved */
+#define AVALANCHE_VDMA_VT_RX_INT 37
+#define AVALANCHE_VDMA_VT_TX_INT 38
+#define AVALANCHE_ADSL_SUB_SYSTEM_INT 39
+
+
+#define AVALANCHE_EMIF_INT 47
+
+
+
+/*-----------------------------------------------------------
+ * Sangam's Reset Bits
+ *---------------------------------------------------------*/
+
+#define AVALANCHE_UART0_RESET_BIT 0
+#define AVALANCHE_UART1_RESET_BIT 1
+#define AVALANCHE_I2C_RESET_BIT 2
+#define AVALANCHE_TIMER0_RESET_BIT 3
+#define AVALANCHE_TIMER1_RESET_BIT 4
+/* Reset bit 5 is reserved. */
+#define AVALANCHE_GPIO_RESET_BIT 6
+#define AVALANCHE_ADSL_SUB_SYS_RESET_BIT 7
+#define AVALANCHE_USB_SLAVE_RESET_BIT 8
+#define AVALANCHE_ATM_SAR_RESET_BIT 9
+/* Reset bit 10 is reserved. */
+#define AVALANCHE_VDMA_VT_RESET_BIT 11
+#define AVALANCHE_FSER_RESET_BIT 12
+/* Reset bit 13 to 15 are reserved */
+#define AVALANCHE_HIGH_VLYNQ_RESET_BIT 16
+#define AVALANCHE_LOW_CPMAC_RESET_BIT 17
+#define AVALANCHE_MCDMA_RESET_BIT 18
+#define AVALANCHE_BIST_RESET_BIT 19
+#define AVALANCHE_LOW_VLYNQ_RESET_BIT 20
+#define AVALANCHE_HIGH_CPMAC_RESET_BIT 21
+#define AVALANCHE_MDIO_RESET_BIT 22
+#define AVALANCHE_ADSL_SUB_SYS_DSP_RESET_BIT 23
+/* Reset bit 24 to 25 are reserved */
+#define AVALANCHE_LOW_EPHY_RESET_BIT 26
+/* Reset bit 27 to 31 are reserved */
+
+
+#define AVALANCHE_POWER_MODULE_USBSP 0
+#define AVALANCHE_POWER_MODULE_WDTP 1
+#define AVALANCHE_POWER_MODULE_UT0P 2
+#define AVALANCHE_POWER_MODULE_UT1P 3
+#define AVALANCHE_POWER_MODULE_IICP 4
+#define AVALANCHE_POWER_MODULE_VDMAP 5
+#define AVALANCHE_POWER_MODULE_GPIOP 6
+#define AVALANCHE_POWER_MODULE_VLYNQ1P 7
+#define AVALANCHE_POWER_MODULE_SARP 8
+#define AVALANCHE_POWER_MODULE_ADSLP 9
+#define AVALANCHE_POWER_MODULE_EMIFP 10
+#define AVALANCHE_POWER_MODULE_ADSPP 12
+#define AVALANCHE_POWER_MODULE_RAMP 13
+#define AVALANCHE_POWER_MODULE_ROMP 14
+#define AVALANCHE_POWER_MODULE_DMAP 15
+#define AVALANCHE_POWER_MODULE_BISTP 16
+#define AVALANCHE_POWER_MODULE_TIMER0P 18
+#define AVALANCHE_POWER_MODULE_TIMER1P 19
+#define AVALANCHE_POWER_MODULE_EMAC0P 20
+#define AVALANCHE_POWER_MODULE_EMAC1P 22
+#define AVALANCHE_POWER_MODULE_EPHYP 24
+#define AVALANCHE_POWER_MODULE_VLYNQ0P 27
+
+
+
+
+
+/*
+ * Sangam board vectors
+ */
+
+#define AVALANCHE_VECS (KSEG1ADDR(AVALANCHE_SDRAM_BASE))
+#define AVALANCHE_VECS_KSEG0 (KSEG0ADDR(AVALANCHE_SDRAM_BASE))
+
+/*-----------------------------------------------------------------------------
+ * Sangam's system register.
+ *
+ *---------------------------------------------------------------------------*/
+#define AVALANCHE_DCL_BOOTCR (KSEG1ADDR(0x08611A00))
+#define AVALANCHE_EMIF_SDRAM_CFG (AVALANCHE_EMIF_CONTROL_BASE + 0x8)
+#define AVALANCHE_RST_CTRL_PRCR (KSEG1ADDR(0x08611600))
+#define AVALANCHE_RST_CTRL_SWRCR (KSEG1ADDR(0x08611604))
+#define AVALANCHE_RST_CTRL_RSR (KSEG1ADDR(0x08611600))
+
+#define AVALANCHE_POWER_CTRL_PDCR (KSEG1ADDR(0x08610A00))
+#define AVALANCHE_WAKEUP_CTRL_WKCR (KSEG1ADDR(0x08610A0C))
+
+#define AVALANCHE_GPIO_DATA_IN (AVALANCHE_GPIO_BASE + 0x0)
+#define AVALANCHE_GPIO_DATA_OUT (AVALANCHE_GPIO_BASE + 0x4)
+#define AVALANCHE_GPIO_DIR (AVALANCHE_GPIO_BASE + 0x8)
+#define AVALANCHE_GPIO_ENBL (AVALANCHE_GPIO_BASE + 0xC)
+#define AVALANCHE_CVR (AVALANCHE_GPIO_BASE + 0x14)
+
+/*
+ * Yamon Prom print address.
+ */
+#define AVALANCHE_YAMON_FUNCTION_BASE (KSEG1ADDR(0x10000500))
+#define AVALANCHE_YAMON_PROM_PRINT_COUNT_ADDR (AVALANCHE_YAMON_FUNCTION_BASE + 0x4) /* print_count function */
+#define AVALANCHE_YAMON_PROM_PRINT_ADDR (AVALANCHE_YAMON_FUNCTION_BASE + 0x34)
+
+#define AVALANCHE_BASE_BAUD ( 3686400 / 16 )
+
+#define AVALANCHE_GPIO_PIN_COUNT 32
+#define AVALANCHE_GPIO_OFF_MAP {0xF34FFFC0}
+
+#include "sangam_boards.h"
+
+#endif /*_SANGAM_H_ */
diff -urN linux.old/include/asm-mips/ar7/tnetd73xx_err.h linux.dev/include/asm-mips/ar7/tnetd73xx_err.h
--- linux.old/include/asm-mips/ar7/tnetd73xx_err.h 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/include/asm-mips/ar7/tnetd73xx_err.h 2005-08-12 19:32:05.171220344 +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-08-12 19:32:05.151223384 +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-08-12 19:32:05.172220192 +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.000000000 +0200
+++ linux.dev/include/asm-mips/io.h 2005-08-12 21:13:28.133469520 +0200
@@ -63,8 +63,12 @@
#ifdef CONFIG_64BIT_PHYS_ADDR
#define page_to_phys(page) ((u64)(page - mem_map) << PAGE_SHIFT)
#else
+#ifdef CONFIG_AR7
+#define page_to_phys(page) (((page - mem_map) << PAGE_SHIFT) + CONFIG_AR7_MEMORY)
+#else
#define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT)
#endif
+#endif
#define IO_SPACE_LIMIT 0xffff
diff -urN linux.old/include/asm-mips/irq.h linux.dev/include/asm-mips/irq.h
--- linux.old/include/asm-mips/irq.h 2005-07-10 03:00:44.000000000 +0200
+++ linux.dev/include/asm-mips/irq.h 2005-08-12 19:32:05.172220192 +0200
@@ -14,7 +14,12 @@
#include <linux/config.h>
#include <linux/linkage.h>
+#ifdef CONFIG_AR7
+#include <asm/ar7/avalanche_intc.h>
+#define NR_IRQS AVALANCHE_INT_END + 1
+#else
#define NR_IRQS 128 /* Largest number of ints of all machines. */
+#endif
#ifdef CONFIG_I8259
static inline int irq_cannonicalize(int irq)
diff -urN linux.old/include/asm-mips/page.h linux.dev/include/asm-mips/page.h
--- linux.old/include/asm-mips/page.h 2005-07-10 03:00:44.000000000 +0200
+++ linux.dev/include/asm-mips/page.h 2005-08-12 21:13:38.481896320 +0200
@@ -129,7 +129,11 @@
#define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
#define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
+#ifdef CONFIG_AR7
+#define virt_to_page(kaddr) phys_to_page(__pa(kaddr))
+#else
#define virt_to_page(kaddr) (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
+#endif
#define VALID_PAGE(page) ((page - mem_map) < max_mapnr)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
diff -urN linux.old/include/asm-mips/pgtable-32.h linux.dev/include/asm-mips/pgtable-32.h
--- linux.old/include/asm-mips/pgtable-32.h 2005-07-10 03:00:44.000000000 +0200
+++ linux.dev/include/asm-mips/pgtable-32.h 2005-08-12 21:13:46.898616784 +0200
@@ -108,7 +108,18 @@
* and a page entry and page directory to the page they refer to.
*/
-#ifdef CONFIG_CPU_VR41XX
+#if defined(CONFIG_AR7)
+#define mk_pte(page, pgprot) \
+({ \
+ pte_t __pte; \
+ \
+ pte_val(__pte) = ((phys_t)(page - mem_map) << (PAGE_SHIFT) | \
+ CONFIG_AR7_MEMORY) | \
+ pgprot_val(pgprot); \
+ \
+ __pte; \
+})
+#elif defined(CONFIG_CPU_VR41XX)
#define mk_pte(page, pgprot) \
({ \
pte_t __pte; \
@@ -130,6 +141,7 @@
})
#endif
+
static inline pte_t mk_pte_phys(phys_t physpage, pgprot_t pgprot)
{
#ifdef CONFIG_CPU_VR41XX
@@ -175,7 +187,10 @@
set_pte(ptep, __pte(0));
}
-#ifdef CONFIG_CPU_VR41XX
+#if defined(CONFIG_AR7)
+#define phys_to_page(phys) (mem_map + (((phys)-CONFIG_AR7_MEMORY) >> PAGE_SHIFT))
+#define pte_page(x) phys_to_page(pte_val(x))
+#elif defined(CONFIG_CPU_VR41XX)
#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 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.000000000 +0200
+++ linux.dev/include/asm-mips/serial.h 2005-08-12 19:32:05.174219888 +0200
@@ -65,6 +65,15 @@
#define C_P(card,port) (((card)<<6|(port)<<3) + 1)
+#ifdef CONFIG_AR7
+#include <asm/ar7/ar7.h>
+#define AR7_SERIAL_PORT_DEFNS \
+ { 0, AR7_BASE_BAUD, AR7_UART0_REGS_BASE, LNXINTNUM(AVALANCHE_UART0_INT), STD_COM_FLAGS }, \
+ { 0, AR7_BASE_BAUD, AR7_UART1_REGS_BASE, LNXINTNUM(AVALANCHE_UART1_INT), STD_COM_FLAGS },
+#else
+#define AR7_SERIAL_PORT_DEFNS
+#endif
+
#ifdef CONFIG_MIPS_JAZZ
#define _JAZZ_SERIAL_INIT(int, base) \
{ .baud_base = JAZZ_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS, \
@@ -468,6 +477,7 @@
#endif
#define SERIAL_PORT_DFNS \
+ AR7_SERIAL_PORT_DEFNS \
ATLAS_SERIAL_PORT_DEFNS \
AU1000_SERIAL_PORT_DEFNS \
COBALT_SERIAL_PORT_DEFNS \
diff -urN linux.old/Makefile linux.dev/Makefile
--- linux.old/Makefile 2005-07-10 03:00:44.000000000 +0200
+++ linux.dev/Makefile 2005-08-12 19:32:05.122227792 +0200
@@ -91,7 +91,7 @@
CPPFLAGS := -D__KERNEL__ -I$(HPATH)
-CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
+CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
-fno-strict-aliasing -fno-common
ifndef CONFIG_FRAME_POINTER
CFLAGS += -fomit-frame-pointer
View Git Blame Copy Permalink