Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv32456/drivers/pcmcia
Modified Files:
Makefile au1000_generic.c
Log Message:
Pb1100 pcmcia support. The ide-cs driver now works.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 2 Apr 2002 22:59:40 -0000 1.5
+++ Makefile 18 Apr 2002 00:03:28 -0000 1.6
@@ -61,10 +61,11 @@
obj-$(CONFIG_PCMCIA_AU1000) += au1000_ss.o
obj-$(CONFIG_PCMCIA_AU1500) += au1500_ss.o
+obj-$(CONFIG_PCMCIA_AU1100) += au1100_ss.o
au1000_ss-objs-y := au1000_generic.o
au1000_ss-objs-$(CONFIG_MIPS_PB1000) += au1000_pb1000.o
au1000_ss-objs-$(CONFIG_MIPS_PB1500) += au1000_pb1500.o
-au1000_ss-objs-$(CONFIG_MIPS_PB1100) += au1000_pb1500.o
+au1000_ss-objs-$(CONFIG_MIPS_PB1100) += au1000_pb1100.o
obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
@@ -95,6 +96,8 @@
$(LD) -r -o $@ $(sa1100_cs-objs-y)
au1000_ss.o: $(au1000_ss-objs-y)
+ $(LD) -r -o $@ $(au1000_ss-objs-y)
+au1100_ss.o: $(au1000_ss-objs-y)
$(LD) -r -o $@ $(au1000_ss-objs-y)
yenta_socket.o: $(yenta_socket-objs)
Index: au1000_generic.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/au1000_generic.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- au1000_generic.c 2 Apr 2002 22:59:40 -0000 1.8
+++ au1000_generic.c 18 Apr 2002 00:03:28 -0000 1.9
@@ -59,6 +59,7 @@
static int pc_debug;
#endif
+MODULE_LICENSE("GPL");
MODULE_AUTHOR("Pete Popov, MontaVista Software <pp...@mv...>");
MODULE_DESCRIPTION("Linux PCMCIA Card Services: Au1x00 Socket Controller");
@@ -84,7 +85,7 @@
static int au1000_pcmcia_driver_init(void);
static void au1000_pcmcia_driver_shutdown(void);
static void au1000_pcmcia_task_handler(void *data);
-static void au1000_pcmcia_poll_event(u32 data);
+static void au1000_pcmcia_poll_event(unsigned long data);
static void au1000_pcmcia_interrupt(int irq, void *dev, struct pt_regs *regs);
static struct tq_struct au1000_pcmcia_task;
@@ -158,7 +159,7 @@
#elif defined(CONFIG_MIPS_PB1500)
pcmcia_low_level=&pb1500_pcmcia_ops;
#elif defined(CONFIG_MIPS_PB1100)
- pcmcia_low_level=&pb1500_pcmcia_ops;
+ pcmcia_low_level=&pb1100_pcmcia_ops;
#else
#error Unsupported AU1000 board.
#endif
@@ -196,10 +197,8 @@
pcmcia_socket[i].cs_state.csc_mask=SS_DETECT;
if (i == 0) {
- printk("sizeof(ioaddr_t) %d\n", sizeof(ioaddr_t));
pcmcia_socket[i].virt_io =
(u32)ioremap((ioaddr_t)0xF00000000, 0x1000);
- printk("pcmcia virt io %x\n", pcmcia_socket[i].virt_io);
pcmcia_socket[i].phys_attr = (memaddr_t)0xF40000000;
pcmcia_socket[i].phys_mem = (memaddr_t)0xF80000000;
}
@@ -308,7 +307,7 @@
};
-static void au1000_pcmcia_poll_event(u32 dummy)
+static void au1000_pcmcia_poll_event(unsigned long dummy)
{
poll_timer.function = au1000_pcmcia_poll_event;
poll_timer.expires = jiffies + AU1000_PCMCIA_POLL_PERIOD;
@@ -700,6 +699,4 @@
p+=sprintf(p, "common : %u\n", pcmcia_socket[sock].speed_mem);
return p-buf;
}
-
-
#endif /* defined(CONFIG_PROC_FS) */
|
