Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv13662/arch/mips/au1000/common
Modified Files:
irq.c reset.c
Log Message:
Au updates and Hydrogen Board support.
Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/irq.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- irq.c 29 May 2002 00:23:16 -0000 1.19
+++ irq.c 25 Sep 2002 07:38:57 -0000 1.20
@@ -53,6 +53,8 @@
#include <asm/pb1500.h>
#elif defined(CONFIG_MIPS_PB1100)
#include <asm/pb1100.h>
+#elif defined(CONFIG_MIPS_HYD1100)
+#include <asm/hyd1100.h>
#else
#error unsupported alchemy board
#endif
@@ -428,9 +430,8 @@
#endif
#ifdef CONFIG_MIPS_PB1500
case AU1000_MAC1_DMA_INT:
-#endif
case AU1500_GPIO_204:
-
+#endif
setup_local_irq(i, INTC_INT_HIGH_LEVEL, 0);
irq_desc[i].handler = &level_irq_type;
break;
@@ -457,6 +458,9 @@
case AU1000_GPIO_11: // PCMCIA_IRQ#
case AU1000_GPIO_13: // DC_IRQ#
case AU1000_GPIO_23: // 2-wire SCL
+#endif
+#ifdef CONFIG_MIPS_HYD1100
+ case AU1000_GPIO_21: // CF IRQ#
#endif
setup_local_irq(i, INTC_INT_LOW_LEVEL, 0);
irq_desc[i].handler = &level_irq_type;
Index: reset.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/reset.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- reset.c 1 May 2002 18:00:29 -0000 1.6
+++ reset.c 25 Sep 2002 07:38:57 -0000 1.7
@@ -102,7 +102,6 @@
au_writel(0x00, 0xb1900028); /* sys_clksrc */
au_writel(0x00, 0xb1900100); /* sys_pininputen */
break;
-
default:
break;
}
@@ -111,6 +110,15 @@
set_cp0_config(CONF_CM_UNCACHED);
flush_cache_all();
write_32bit_cp0_register(CP0_WIRED, 0);
+
+#ifdef CONFIG_MIPS_PB1500
+ au_writel(0x00000000, 0xAE00001C);
+#endif
+
+#ifdef CONFIG_MIPS_PB1100
+ au_writel(0x00000000, 0xAE00001C);
+#endif
+
__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));
}
|
