[Linux-mips-commits]CVS: linux/arch/mips/au1000/common irq.c,1.16,1.17 reset.c,1.4,1.5

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv13922/arch/mips/au1000/common

Modified Files:
	irq.c reset.c 
Log Message:
Pb1100 support.


Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/irq.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- irq.c	23 Mar 2002 02:13:01 -0000	1.16
+++ irq.c	2 Apr 2002 22:59:39 -0000	1.17
@@ -51,6 +51,8 @@
 #include <asm/pb1000.h>
 #elif defined(CONFIG_MIPS_PB1500)
 #include <asm/pb1500.h>
+#elif defined(CONFIG_MIPS_PB1100)
+#include <asm/pb1100.h>
 #else
 #error unsupported alchemy board
 #endif
@@ -402,6 +404,12 @@
 			case AU1000_SSI1_INT:
 #endif
 
+#ifdef CONFIG_MIPS_PB1100
+			case AU1000_UART1_INT:
+
+			case AU1000_SSI0_INT:
+			case AU1000_SSI1_INT:
+#endif
 		        case AU1000_DMA_INT_BASE:
 		        case AU1000_DMA_INT_BASE+1:
 		        case AU1000_DMA_INT_BASE+2:
@@ -415,9 +423,14 @@
 			case AU1000_IRDA_RX_INT:
 
 			case AU1000_MAC0_DMA_INT:
+#ifdef CONFIG_MIPS_PB1000
 			case AU1000_MAC1_DMA_INT:
-
+#endif
+#ifdef CONFIG_MIPS_PB1500
+			case AU1000_MAC1_DMA_INT:
+#endif
 			case AU1500_GPIO_204:
+
 				setup_local_irq(i, INTC_INT_HIGH_LEVEL, 0);
 				irq_desc[i].handler = &level_irq_type;
 				break;
@@ -436,6 +449,14 @@
 			case AU1500_GPIO_203:
 			case AU1500_GPIO_205:
 			case AU1500_GPIO_207:
+#endif
+
+#ifdef CONFIG_MIPS_PB1100
+			case AU1000_GPIO_9: // PCMCIA Card Fully_Interted#
+			case AU1000_GPIO_10: // PCMCIA_STSCHG#
+			case AU1000_GPIO_11: // PCMCIA_IRQ#
+			case AU1000_GPIO_13: // DC_IRQ# 
+			case AU1000_GPIO_23: // 2-wire SCL
 #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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- reset.c	26 Feb 2002 17:34:14 -0000	1.4
+++ reset.c	2 Apr 2002 22:59:39 -0000	1.5
@@ -47,41 +47,61 @@
 	switch (prid & 0xFF000000)
 	{
 	case 0x00000000: /* Au1000 */
-		outl(0x02, 0xb0000010); /* ac97_enable */
-		outl(0x08, 0xb017fffc); /* usbh_enable - early errata */
+		writel(0x02, 0xb0000010); /* ac97_enable */
+		writel(0x08, 0xb017fffc); /* usbh_enable - early errata */
 		asm("sync");
-		outl(0x00, 0xb017fffc); /* usbh_enable */
-		outl(0x00, 0xb0200058); /* usbd_enable */
-		outl(0x00, 0xb0300040); /* ir_enable */
-		outl(0x00, 0xb0520000); /* macen0 */
-		outl(0x00, 0xb0520004); /* macen1 */
-		outl(0x00, 0xb1000008); /* i2s_enable  */
-		outl(0x00, 0xb1100100); /* uart0_enable */
-		outl(0x00, 0xb1200100); /* uart1_enable */
-		outl(0x00, 0xb1300100); /* uart2_enable */
-		outl(0x00, 0xb1400100); /* uart3_enable */
-		outl(0x02, 0xb1600100); /* ssi0_enable */
-		outl(0x02, 0xb1680100); /* ssi1_enable */
-		outl(0x00, 0xb1900020); /* sys_freqctrl0 */
-		outl(0x00, 0xb1900024); /* sys_freqctrl1 */
-		outl(0x00, 0xb1900028); /* sys_clksrc */
-		outl(0x00, 0xb1900100); /* sys_pininputen */
+		writel(0x00, 0xb017fffc); /* usbh_enable */
+		writel(0x00, 0xb0200058); /* usbd_enable */
+		writel(0x00, 0xb0300040); /* ir_enable */
+		writel(0x00, 0xb0520000); /* macen0 */
+		writel(0x00, 0xb0520004); /* macen1 */
+		writel(0x00, 0xb1000008); /* i2s_enable  */
+		writel(0x00, 0xb1100100); /* uart0_enable */
+		writel(0x00, 0xb1200100); /* uart1_enable */
+		writel(0x00, 0xb1300100); /* uart2_enable */
+		writel(0x00, 0xb1400100); /* uart3_enable */
+		writel(0x02, 0xb1600100); /* ssi0_enable */
+		writel(0x02, 0xb1680100); /* ssi1_enable */
+		writel(0x00, 0xb1900020); /* sys_freqctrl0 */
+		writel(0x00, 0xb1900024); /* sys_freqctrl1 */
+		writel(0x00, 0xb1900028); /* sys_clksrc */
+		writel(0x00, 0xb1900100); /* sys_pininputen */
 		break;
 	case 0x01000000: /* Au1500 */
-		outl(0x02, 0xb0000010); /* ac97_enable */
-		outl(0x08, 0xb017fffc); /* usbh_enable - early errata */
+		writel(0x02, 0xb0000010); /* ac97_enable */
+		writel(0x08, 0xb017fffc); /* usbh_enable - early errata */
 		asm("sync");
-		outl(0x00, 0xb017fffc); /* usbh_enable */
-		outl(0x00, 0xb0200058); /* usbd_enable */
-		outl(0x00, 0xb1520000); /* macen0 */
-		outl(0x00, 0xb1520004); /* macen1 */
-		outl(0x00, 0xb1100100); /* uart0_enable */
-		outl(0x00, 0xb1400100); /* uart3_enable */
-		outl(0x00, 0xb1900020); /* sys_freqctrl0 */
-		outl(0x00, 0xb1900024); /* sys_freqctrl1 */
-		outl(0x00, 0xb1900028); /* sys_clksrc */
-		outl(0x00, 0xb1900100); /* sys_pininputen */
-
+		writel(0x00, 0xb017fffc); /* usbh_enable */
+		writel(0x00, 0xb0200058); /* usbd_enable */
+		writel(0x00, 0xb1520000); /* macen0 */
+		writel(0x00, 0xb1520004); /* macen1 */
+		writel(0x00, 0xb1100100); /* uart0_enable */
+		writel(0x00, 0xb1400100); /* uart3_enable */
+		writel(0x00, 0xb1900020); /* sys_freqctrl0 */
+		writel(0x00, 0xb1900024); /* sys_freqctrl1 */
+		writel(0x00, 0xb1900028); /* sys_clksrc */
+		writel(0x00, 0xb1900100); /* sys_pininputen */
+		break;
+	case 0x02000000: /* Au1100 */
+		writel(0x02, 0xb0000010); /* ac97_enable */
+		writel(0x08, 0xb017fffc); /* usbh_enable - early errata */
+		asm("sync");
+		writel(0x00, 0xb017fffc); /* usbh_enable */
+		writel(0x00, 0xb0200058); /* usbd_enable */
+		writel(0x00, 0xb0300040); /* ir_enable */
+		writel(0x00, 0xb0520000); /* macen0 */	   
+		writel(0x00, 0xb1000008); /* i2s_enable  */
+		writel(0x00, 0xb1100100); /* uart0_enable */
+		writel(0x00, 0xb1200100); /* uart1_enable */
+		writel(0x00, 0xb1400100); /* uart3_enable */
+		writel(0x02, 0xb1600100); /* ssi0_enable */
+		writel(0x02, 0xb1680100); /* ssi1_enable */
+		writel(0x00, 0xb1900020); /* sys_freqctrl0 */
+		writel(0x00, 0xb1900024); /* sys_freqctrl1 */
+		writel(0x00, 0xb1900028); /* sys_clksrc */
+		writel(0x00, 0xb1900100); /* sys_pininputen */
+		break;
+		
 	default:
 		break;
 	}