linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ppopov@linux-mips.org
Date: Sat, 17 Sep 2005 01:38:17 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ppopov@ftp.linux-mips.org       05/09/17 01:38:10

Modified files:
        arch/mips/configs: db1200_defconfig 
        drivers/pcmcia : Makefile au1000_db1x00.c au1000_generic.h 
        include/asm-mips/mach-db1x00: db1200.h 
        include/asm-mips/mach-pb1x00: pb1200.h 

Log message:
        Updated pcmcia driver with pb1200 and db1200 support.
        Updated db1200_defconfig so pcmcia is enabled by default.

diff -urN linux/arch/mips/configs/db1200_defconfig 
linux/arch/mips/configs/db1200_defconfig
--- linux/arch/mips/configs/db1200_defconfig    2005/09/15 19:48:56     1.4
+++ linux/arch/mips/configs/db1200_defconfig    2005/09/17 00:38:10     1.5
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.14-rc1
-# Thu Sep 15 12:39:45 2005
+# Fri Sep 16 17:22:46 2005
 #
 CONFIG_MIPS=y
 
@@ -189,7 +189,17 @@
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+# CONFIG_TCIC is not set
+CONFIG_PCMCIA_AU1X00=m
 
 #
 # PCI Hotplug Support
@@ -424,6 +434,7 @@
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_BLK_DEV_IDECS is not set
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -484,6 +495,15 @@
 # CONFIG_SCSI_DEBUG is not set
 
 #
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
@@ -540,6 +560,11 @@
 # CONFIG_NET_RADIO is not set
 
 #
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
 # Wan interfaces
 #
 # CONFIG_WAN is not set
@@ -637,6 +662,11 @@
 #
 # Ftape, the floppy tape device driver
 #
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
diff -urN linux/drivers/pcmcia/Makefile linux/drivers/pcmcia/Makefile
--- linux/drivers/pcmcia/Makefile       2005/09/15 08:54:58     1.42
+++ linux/drivers/pcmcia/Makefile       2005/09/17 00:38:10     1.43
@@ -42,9 +42,11 @@
 au1x00_ss-y                                    += au1000_generic.o
 au1x00_ss-$(CONFIG_MIPS_PB1000)                        += au1000_pb1x00.o
 au1x00_ss-$(CONFIG_MIPS_PB1100)                        += au1000_pb1x00.o
+au1x00_ss-$(CONFIG_MIPS_PB1200)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_PB1500)                        += au1000_pb1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1000)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1100)                        += au1000_db1x00.o
+au1x00_ss-$(CONFIG_MIPS_DB1200)                 += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1500)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_DB1550)                        += au1000_db1x00.o
 au1x00_ss-$(CONFIG_MIPS_XXS1500)               += au1000_xxs1500.o
diff -urN linux/drivers/pcmcia/au1000_db1x00.c 
linux/drivers/pcmcia/au1000_db1x00.c
--- linux/drivers/pcmcia/au1000_db1x00.c        2005/07/10 10:29:01     1.8
+++ linux/drivers/pcmcia/au1000_db1x00.c        2005/09/17 00:38:10     1.9
@@ -41,7 +41,15 @@
 #include <asm/irq.h>
 #include <asm/signal.h>
 #include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-db1x00/db1x00.h>
+
+#if defined(CONFIG_MIPS_DB1200)
+       #include <db1200.h>
+#elif defined(CONFIG_MIPS_PB1200)
+       #include <pb1200.h>
+#else
+       #include <asm/mach-db1x00/db1x00.h>
+       static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
+#endif
 
 #include "au1000_generic.h"
 
@@ -51,7 +59,6 @@
 #define debug(x,args...)
 #endif
 
-static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
 
 struct au1000_pcmcia_socket au1000_pcmcia_socket[PCMCIA_NUM_SOCKS];
 extern int au1x00_pcmcia_socket_probe(struct device *, struct pcmcia_low_level 
*, int, int);
@@ -60,6 +67,8 @@
 {
 #ifdef CONFIG_MIPS_DB1550
        skt->irq = skt->nr ? AU1000_GPIO_5 : AU1000_GPIO_3;
+#elif defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)
+       skt->irq = skt->nr ? BOARD_PC1_INT : BOARD_PC0_INT;
 #else
        skt->irq = skt->nr ? AU1000_GPIO_5 : AU1000_GPIO_2;
 #endif
@@ -86,11 +95,19 @@
        switch (skt->nr) {
        case 0:
                vs = bcsr->status & 0x3;
+#if defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)
+               inserted = BOARD_CARD_INSERTED(0);
+#else
                inserted = !(bcsr->status & (1<<4));
+#endif
                break;
        case 1:
                vs = (bcsr->status & 0xC)>>2;
+#if defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200) 
+               inserted = BOARD_CARD_INSERTED(1);
+#else
                inserted = !(bcsr->status & (1<<5));
+#endif
                break;
        default:/* should never happen */
                return;
diff -urN linux/drivers/pcmcia/au1000_generic.h 
linux/drivers/pcmcia/au1000_generic.h
--- linux/drivers/pcmcia/au1000_generic.h       2005/07/13 11:49:53     1.9
+++ linux/drivers/pcmcia/au1000_generic.h       2005/09/17 00:38:10     1.10
@@ -46,13 +46,13 @@
 /* pcmcia socket 1 needs external glue logic so the memory map
  * differs from board to board.
  */
-#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || 
defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550)
+#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || 
defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || 
defined(CONFIG_MIPS_PB1200)
 #define AU1X_SOCK1_IO        0xF08000000
 #define AU1X_SOCK1_PHYS_ATTR 0xF48000000
 #define AU1X_SOCK1_PHYS_MEM  0xF88000000
 #define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000
 #define AU1X_SOCK1_PSEUDO_PHYS_MEM  0xF8800000
-#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || 
defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550)
+#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || 
defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || 
defined(CONFIG_MIPS_DB1200)
 #define AU1X_SOCK1_IO        0xF04000000
 #define AU1X_SOCK1_PHYS_ATTR 0xF44000000
 #define AU1X_SOCK1_PHYS_MEM  0xF84000000
diff -urN linux/include/asm-mips/mach-db1x00/db1200.h 
linux/include/asm-mips/mach-db1x00/db1200.h
--- linux/include/asm-mips/mach-db1x00/db1200.h 2005/04/14 11:31:26     1.2
+++ linux/include/asm-mips/mach-db1x00/db1200.h 2005/09/17 00:38:10     1.3
@@ -206,6 +206,16 @@
 #define DB1200_INT_END                 (DB1200_INT_BEGIN + 15)
 
 /* For drivers/pcmcia/au1000_db1x00.c */
+
+/* PCMCIA Db1x00 specific defines */
+
+#define PCMCIA_MAX_SOCK 1
+#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1)
+
+/* VPP/VCC */
+#define SET_VCC_VPP(VCC, VPP, SLOT)\
+       ((((VCC)<<2) | ((VPP)<<0)) << ((SLOT)*8))
+
 #define BOARD_PC0_INT DB1200_PC0_INT
 #define BOARD_PC1_INT DB1200_PC1_INT
 #define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET)))
diff -urN linux/include/asm-mips/mach-pb1x00/pb1200.h 
linux/include/asm-mips/mach-pb1x00/pb1200.h
--- linux/include/asm-mips/mach-pb1x00/pb1200.h 2005/04/14 11:31:26     1.2
+++ linux/include/asm-mips/mach-pb1x00/pb1200.h 2005/09/17 00:38:10     1.3
@@ -173,6 +173,14 @@
 #define BCSR_INT_SD1INSERT     0x4000
 #define BCSR_INT_SD1EJECT      0x8000
 
+/* PCMCIA Db1x00 specific defines */
+#define PCMCIA_MAX_SOCK 1
+#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1)
+
+/* VPP/VCC */
+#define SET_VCC_VPP(VCC, VPP, SLOT)\
+       ((((VCC)<<2) | ((VPP)<<0)) << ((SLOT)*8))
+
 #define AU1XXX_SMC91111_PHYS_ADDR      (0x0D000300)
 #define AU1XXX_SMC91111_IRQ                    PB1200_ETH_INT
 

<Prev in Thread] Current Thread [Next in Thread>