[Linux-mips-commits]CVS: linux/include/asm-mips au1000.h,1.17,1.18 au1000_pcmcia.h,1.6,1.7 pb1100.h,1.1,1.2

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

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv32456/include/asm-mips

Modified Files:
	au1000.h au1000_pcmcia.h pb1100.h 
Log Message:
Pb1100 pcmcia support.  The ide-cs driver now works.


Index: au1000.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- au1000.h	5 Apr 2002 23:25:15 -0000	1.17
+++ au1000.h	18 Apr 2002 00:03:28 -0000	1.18
@@ -777,6 +777,7 @@
 #define SYS_OUTPUTSET             0xB1900108
 #define SYS_OUTPUTCLR             0xB190010C
 #define SYS_PINSTATERD            0xB1900110
+#define SYS_PININPUTEN            0xB1900110
 
 /* GPIO2, Au1500 only */
 #define GPIO2_BASE                0xB1700000

Index: au1000_pcmcia.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000_pcmcia.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- au1000_pcmcia.h	2 Apr 2002 22:59:40 -0000	1.6
+++ au1000_pcmcia.h	18 Apr 2002 00:03:28 -0000	1.7
@@ -90,7 +90,7 @@
 #elif defined (CONFIG_MIPS_PB1500)
 extern struct pcmcia_low_level pb1500_pcmcia_ops;
 #elif defined (CONFIG_MIPS_PB1100)
-extern struct pcmcia_low_level pb1500_pcmcia_ops;
+extern struct pcmcia_low_level pb1100_pcmcia_ops;
 #endif
 
 #endif /* __ASM_AU1000_PCMCIA_H */

Index: pb1100.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pb1100.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pb1100.h	2 Apr 2002 22:59:40 -0000	1.1
+++ pb1100.h	18 Apr 2002 00:03:28 -0000	1.2
@@ -27,19 +27,55 @@
 #ifndef __ASM_PB1100_H
 #define __ASM_PB1100_H
 
-#define PB1500_IDENT          0xAE000000
-#define PB1500_BOARD_STATUS   0xAE000004
-#define PB1500_PCI_PCMCIA     0xAE000010
-  #define PC_DEASSERT_RST           0x80
-  #define PC_DRV_EN                 0x10 
-#define PB1500_G_CONTROL      0xAE000014
-#define PB1500_RST_VDDI       0xAE00001C
-#define PB1500_LEDS           0xAE000018
+#define PB1100_IDENT          0xAE000000
+#define PB1100_BOARD_STATUS   0xAE000004
+  #define PB1100_ROM_SEL         (1<<15)
+  #define PB1100_ROM_SIZ         (1<<14)
+  #define PB1100_SWAP_BOOT       (1<<13)
+  #define PB1100_FLASH_WP        (1<<12)
+  #define PB1100_ROM_H_STS       (1<<11)
+  #define PB1100_ROM_L_STS       (1<<10)
+  #define PB1100_FLASH_H_STS      (1<<9)
+  #define PB1100_FLASH_L_STS      (1<<8)
+  #define PB1100_SRAM_SIZ         (1<<7)
+  #define PB1100_TSC_BUSY         (1<<6)
+  #define PB1100_PCMCIA_VS_MASK   (3<<4)
+  #define PB1100_RS232_CD         (1<<3)
+  #define PB1100_RS232_CTS        (1<<2)
+  #define PB1100_RS232_DSR        (1<<1)
+  #define PB1100_RS232_RI         (1<<0)
 
-#define PB1500_HEX_LED        0xAF000004
-#define PB1500_HEX_LED_BLANK  0xAF000008
+#define PB1100_IRDA_RS232     0xAE00000C
+  #define PB1100_IRDA_FULL       (0<<14) /* full power */
+  #define PB1100_IRDA_SHUTDOWN   (1<<14)
+  #define PB1100_IRDA_TT         (2<<14) /* 2/3 power */
+  #define PB1100_IRDA_OT         (3<<14) /* 1/3 power */
+  #define PB1100_IRDA_FIR        (1<<13)
 
-/* PCMCIA PB1500 specific defines */
+#define PB1100_MEM_PCMCIA     0xAE000010
+  #define PB1100_SD_WP1_RO       (1<<15) /* read only */
+  #define PB1100_SD_WP0_RO       (1<<14) /* read only */
+  #define PB1100_SD_PWR1         (1<<11) /* applies power to SD1 */
+  #define PB1100_SD_PWR0         (1<<10) /* applies power to SD0 */
+  #define PB1100_SEL_SD_CONN1     (1<<9) 
+  #define PB1100_SEL_SD_CONN0     (1<<8) 
+  #define PB1100_PC_DEASSERT_RST  (1<<7)
+  #define PB1100_PC_DRV_EN        (1<<4)
+
+#define PB1100_G_CONTROL      0xAE000014 /* graphics control */
+
+#define PB1100_RST_VDDI       0xAE00001C
+  #define PB1100_SOFT_RESET      (1<<15) /* clear to reset the board */
+  #define PB1100_VDDI_MASK        (0x1F)
+
+#define PB1100_LEDS           0xAE000018
+
+/* 11:8 is 4 discreet LEDs. Clearing a bit illuminates the LED.
+ * 7:0 is the LED Display's decimal points.
+ */
+#define PB1100_HEX_LED        0xAE000018
+
+/* PCMCIA PB1100 specific defines */
 #define PCMCIA_MAX_SOCK 0
 
 /* VPP/VCC */