Merge branch 'for-2.6.23' into merge

2 files changed, 176 insertions, 192 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 35f88649d3b7..c0c77f82d051 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -180,14 +180,15 @@ config TCIC
           PCMCIA cards are plugged into. If unsure, say N.
 
 config PCMCIA_M8XX
-        tristate "MPC8xx PCMCIA support"
-        depends on PCMCIA && PPC && 8xx 
-        select PCCARD_IODYN
-        help
-        Say Y here to include support for PowerPC 8xx series PCMCIA
-        controller.
-
-        This driver is also available as a module called m8xx_pcmcia.
+        tristate "MPC8xx PCMCIA support"
+        depends on PCMCIA && PPC && 8xx
+        select PCCARD_IODYN
+        select PCCARD_NONSTATIC
+        help
+          Say Y here to include support for PowerPC 8xx series PCMCIA
+          controller.
+
+          This driver is also available as a module called m8xx_pcmcia.
 
 config HD64465_PCMCIA
         tristate "HD64465 host bridge support"
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 9721ed7bf502..3b40f9623cc9 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -10,7 +10,7 @@
  * Further fixes, v2.6 kernel port
  *     <marcelo.tosatti@cyclades.com>
  * 
- * Some fixes, additions (C) 2005 Montavista Software, Inc. 
+ * Some fixes, additions (C) 2005-2007 Montavista Software, Inc.
  *     <vbordug@ru.mvista.com>
  *
  * "The ExCA standard specifies that socket controllers should provide
@@ -40,10 +40,6 @@
 #include <linux/fcntl.h>
 #include <linux/string.h>
 
-#include <asm/io.h>
-#include <asm/bitops.h>
-#include <asm/system.h>
-
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
@@ -51,11 +47,18 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/platform_device.h>
+#include <linux/fsl_devices.h>
 
+#include <asm/io.h>
+#include <asm/bitops.h>
+#include <asm/system.h>
+#include <asm/time.h>
 #include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/irq.h>
+#include <asm/fs_pd.h>
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
@@ -146,27 +149,17 @@ MODULE_LICENSE("Dual MPL/GPL");
 #define PCMCIA_MEM_WIN_BASE 0xe0000000 /* base address for memory window 0   */
 #define PCMCIA_MEM_WIN_SIZE 0x04000000 /* each memory window is 64 MByte     */
 #define PCMCIA_IO_WIN_BASE  _IO_BASE   /* base address for io window 0       */
-
-#define PCMCIA_SCHLVL PCMCIA_INTERRUPT /* Status Change Interrupt Level      */
-
 /* ------------------------------------------------------------------------- */
 
-/* 2.4.x and newer has this always in HZ */
-#define M8XX_BUSFREQ ((((bd_t *)&(__res))->bi_busfreq))
-
-static int pcmcia_schlvl = PCMCIA_SCHLVL;
+static int pcmcia_schlvl;
 
 static DEFINE_SPINLOCK(events_lock);
 
-
 #define PCMCIA_SOCKET_KEY_5V 1
 #define PCMCIA_SOCKET_KEY_LV 2
 
 /* look up table for pgcrx registers */
-static u32 *m8xx_pgcrx[2] = {
-        &((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pgcra,
-        &((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pgcrb
-};
+static u32 *m8xx_pgcrx[2];
 
 /*
  * This structure is used to address each window in the PCMCIA controller.
@@ -228,11 +221,16 @@ struct event_table {
         u32 eventbit;
 };
 
+static const char driver_name[] = "m8xx-pcmcia";
+
 struct socket_info {
         void    (*handler)(void *info, u32 events);
         void    *info;
 
         u32 slot;
+        pcmconf8xx_t *pcmcia;
+        u32 bus_freq;
+        int hwirq;
 
         socket_state_t state;
         struct pccard_mem_map mem_win[PCMCIA_MEM_WIN_NO];
@@ -408,78 +406,21 @@ static void hardware_disable(int slot)
 #if defined(CONFIG_MPC885ADS)
 
 #define PCMCIA_BOARD_MSG "MPC885ADS"
+#define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V
 
-static int voltage_set(int slot, int vcc, int vpp)
+static inline void hardware_enable(int slot)
 {
-        u32 reg = 0;
-        unsigned *bcsr_io;
-
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-
-        switch(vcc) {
-                case 0:
-                        break;
-                case 33:
-                        reg |= BCSR1_PCCVCC0;
-                        break;
-                case 50:
-                        reg |= BCSR1_PCCVCC1;
-                        break;
-                default:
-                        goto out_unmap;
-        }
-
-        switch(vpp) {
-                case 0:
-                        break;
-                case 33:
-                case 50:
-                        if(vcc == vpp)
-                                reg |= BCSR1_PCCVPP1;
-                        else
-                                goto out_unmap;
-                        break;
-                case 120:
-                        if ((vcc == 33) || (vcc == 50))
-                                reg |= BCSR1_PCCVPP0;
-                        else
-                                goto out_unmap;
-                default:
-                        goto out_unmap;
-        }
-
-        /* first, turn off all power */
-        out_be32(bcsr_io, in_be32(bcsr_io) & ~(BCSR1_PCCVCC_MASK | BCSR1_PCCVPP_MASK));
-
-        /* enable new powersettings */
-        out_be32(bcsr_io, in_be32(bcsr_io) | reg);
-
-        iounmap(bcsr_io);
-        return 0;
-
-out_unmap:
-        iounmap(bcsr_io);
-        return 1;
+         m8xx_pcmcia_ops.hw_ctrl(slot, 1);
 }
 
-#define socket_get(_slot_) PCMCIA_SOCKET_KEY_5V
-
-static void hardware_enable(int slot)
+static inline void hardware_disable(int slot)
 {
-        unsigned *bcsr_io;
-
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-        out_be32(bcsr_io, in_be32(bcsr_io) & ~BCSR1_PCCEN);
-        iounmap(bcsr_io);
+        m8xx_pcmcia_ops.hw_ctrl(slot, 0);
 }
 
-static void hardware_disable(int slot)
+static inline int voltage_set(int slot, int vcc, int vpp)
 {
-        unsigned *bcsr_io;
-
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-        out_be32(bcsr_io, in_be32(bcsr_io) |  BCSR1_PCCEN);
-        iounmap(bcsr_io);
+        return m8xx_pcmcia_ops.voltage_set(slot, vcc, vpp);
 }
 
 #endif
@@ -604,48 +545,6 @@ static int voltage_set(int slot, int vcc, int vpp)
 
 #endif /* CONFIG_PRxK */
 
-static void m8xx_shutdown(void)
-{
-        u32 m, i;
-        struct pcmcia_win *w;
-
-        for(i = 0; i < PCMCIA_SOCKETS_NO; i++){
-                w = (void *) &((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pbr0;
-
-                out_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pscr, M8XX_PCMCIA_MASK(i));
-                out_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per, in_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per) & ~M8XX_PCMCIA_MASK(i));
-
-                /* turn off interrupt and disable CxOE */
-                out_be32(M8XX_PGCRX(i), M8XX_PGCRX_CXOE);
-
-                /* turn off memory windows */
-                for(m = 0; m < PCMCIA_MEM_WIN_NO; m++) {
-                        out_be32(&w->or, 0); /* set to not valid */
-                        w++;
-                }
-
-                /* turn off voltage */
-                voltage_set(i, 0, 0);
-
-                /* disable external hardware */
-                hardware_disable(i);
-        }
-
-        free_irq(pcmcia_schlvl, NULL);
-}
-
-static struct device_driver m8xx_driver = {
-        .name = "m8xx-pcmcia",
-        .bus = &platform_bus_type,
-        .suspend = pcmcia_socket_dev_suspend,
-        .resume = pcmcia_socket_dev_resume,
-};
-
-static struct platform_device m8xx_device = {
-        .name = "m8xx-pcmcia",
-        .id = 0,
-};
-
 static u32 pending_events[PCMCIA_SOCKETS_NO];
 static DEFINE_SPINLOCK(pending_event_lock);
 
@@ -654,13 +553,14 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev)
         struct socket_info *s;
         struct event_table *e;
         unsigned int i, events, pscr, pipr, per;
+        pcmconf8xx_t    *pcmcia = socket[0].pcmcia;
 
         dprintk("Interrupt!\n");
         /* get interrupt sources */
 
-        pscr = in_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pscr);
-        pipr = in_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pipr);
-        per = in_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per);
+        pscr = in_be32(&pcmcia->pcmc_pscr);
+        pipr = in_be32(&pcmcia->pcmc_pipr);
+        per = in_be32(&pcmcia->pcmc_per);
 
         for(i = 0; i < PCMCIA_SOCKETS_NO; i++) {
                 s = &socket[i];
@@ -724,7 +624,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev)
                         per &= ~M8XX_PCMCIA_RDY_L(0);
                         per &= ~M8XX_PCMCIA_RDY_L(1);
 
-                        out_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per, per);
+                        out_be32(&pcmcia->pcmc_per, per);
 
                         if (events)
                                 pcmcia_parse_events(&socket[i].socket, events);
@@ -732,7 +632,7 @@ static irqreturn_t m8xx_interrupt(int irq, void *dev)
         }
 
         /* clear the interrupt sources */
-        out_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pscr, pscr);
+        out_be32(&pcmcia->pcmc_pscr, pscr);
 
         dprintk("Interrupt done.\n");
 
@@ -753,7 +653,7 @@ static u32 m8xx_get_graycode(u32 size)
         return k;
 }
 
-static u32 m8xx_get_speed(u32 ns, u32 is_io)
+static u32 m8xx_get_speed(u32 ns, u32 is_io, u32 bus_freq)
 {
         u32 reg, clocks, psst, psl, psht;
 
@@ -781,7 +681,7 @@ static u32 m8xx_get_speed(u32 ns, u32 is_io)
 
 #define ADJ 180 /* 80 % longer accesstime - to be sure */
 
-        clocks = ((M8XX_BUSFREQ / 1000) * ns) / 1000;
+        clocks = ((bus_freq / 1000) * ns) / 1000;
         clocks = (clocks * ADJ) / (100*1000);
         if(clocks >= PCMCIA_BMT_LIMIT) {
                 printk( "Max access time limit reached\n");
@@ -806,8 +706,9 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value)
         int lsock = container_of(sock, struct socket_info, socket)->slot;
         struct socket_info *s = &socket[lsock];
         unsigned int pipr, reg;
+        pcmconf8xx_t *pcmcia = s->pcmcia;
 
-        pipr = in_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pipr);
+        pipr = in_be32(&pcmcia->pcmc_pipr);
 
         *value  = ((pipr & (M8XX_PCMCIA_CD1(lsock)
                             | M8XX_PCMCIA_CD2(lsock))) == 0) ? SS_DETECT : 0;
@@ -918,6 +819,7 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
         struct event_table *e;
         unsigned int reg;
         unsigned long flags;
+        pcmconf8xx_t *pcmcia = socket[0].pcmcia;
 
         dprintk( "SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "
               "io_irq %d, csc_mask %#2.2x)\n", lsock, state->flags,
@@ -927,6 +829,7 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
         if(voltage_set(lsock, state->Vcc, state->Vpp))
                 return -EINVAL;
 
+
         /* Take care of reset... */
         if(state->flags & SS_RESET)
                 out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) |  M8XX_PGCRX_CXRESET); /* active high */
@@ -982,7 +885,8 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
                  * If io_irq is non-zero we should enable irq.
                  */
                 if(state->io_irq) {
-                        out_be32(M8XX_PGCRX(lsock), in_be32(M8XX_PGCRX(lsock)) | mk_int_int_mask(state->io_irq) << 24);
+                        out_be32(M8XX_PGCRX(lsock),
+                                 in_be32(M8XX_PGCRX(lsock)) | mk_int_int_mask(s->hwirq) << 24);
                         /*
                          * Strange thing here:
                          * The manual does not tell us which interrupt
@@ -1027,7 +931,7 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
          * Writing ones will clear the bits.
          */
 
-        out_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pscr, reg);
+        out_be32(&pcmcia->pcmc_pscr, reg);
 
         /*
          * Write the mask.
@@ -1036,15 +940,8 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
          * Ones will enable the interrupt.
          */
 
-        /*
-          reg |= ((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per
-          & M8XX_PCMCIA_MASK(lsock);
-        */
-
-        reg |= in_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per) &
-                (M8XX_PCMCIA_MASK(0) | M8XX_PCMCIA_MASK(1));
-
-        out_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per, reg);
+        reg |= in_be32(&pcmcia->pcmc_per) & (M8XX_PCMCIA_MASK(0) | M8XX_PCMCIA_MASK(1));
+        out_be32(&pcmcia->pcmc_per, reg);
 
         spin_unlock_irqrestore(&events_lock, flags);
 
@@ -1062,6 +959,8 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
         struct socket_info *s = &socket[lsock];
         struct pcmcia_win *w;
         unsigned int reg, winnr;
+        pcmconf8xx_t *pcmcia = s->pcmcia;
+
 
 #define M8XX_SIZE (io->stop - io->start + 1)
 #define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start)
@@ -1086,7 +985,7 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
 
                 /* setup registers */
 
-                w = (void *) &((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pbr0;
+                w = (void *) &pcmcia->pcmc_pbr0;
                 w += winnr;
 
                 out_be32(&w->or, 0); /* turn off window first */
@@ -1095,12 +994,13 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
                 reg <<= 27;
                 reg |= M8XX_PCMCIA_POR_IO |(lsock << 2);
 
-                reg |= m8xx_get_speed(io->speed, 1);
+                reg |= m8xx_get_speed(io->speed, 1, s->bus_freq);
 
                 if(io->flags & MAP_WRPROT)
                         reg |= M8XX_PCMCIA_POR_WRPROT;
 
-                if(io->flags & (MAP_16BIT | MAP_AUTOSZ))
+                /*if(io->flags & (MAP_16BIT | MAP_AUTOSZ))*/
+                if(io->flags & MAP_16BIT)
                         reg |= M8XX_PCMCIA_POR_16BIT;
 
                 if(io->flags & MAP_ACTIVE)
@@ -1117,7 +1017,7 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
 
                 /* setup registers */
 
-                w = (void *) &((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pbr0;
+                w = (void *) &pcmcia->pcmc_pbr0;
                 w += winnr;
 
                 out_be32(&w->or, 0); /* turn off window */
@@ -1144,6 +1044,7 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
         struct pcmcia_win *w;
         struct pccard_mem_map *old;
         unsigned int reg, winnr;
+        pcmconf8xx_t *pcmcia = s->pcmcia;
 
         dprintk( "SetMemMap(%d, %d, %#2.2x, %d ns, "
               "%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags,
@@ -1166,12 +1067,12 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
 
         /* Setup the window in the pcmcia controller */
 
-        w = (void *) &((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pbr0;
+        w = (void *) &pcmcia->pcmc_pbr0;
         w += winnr;
 
         reg |= lsock << 2;
 
-        reg |= m8xx_get_speed(mem->speed, 0);
+        reg |= m8xx_get_speed(mem->speed, 0, s->bus_freq);
 
         if(mem->flags & MAP_ATTRIB)
                 reg |=  M8XX_PCMCIA_POR_ATTRMEM;
@@ -1236,60 +1137,69 @@ static int m8xx_sock_init(struct pcmcia_socket *sock)
 
 }
 
-static int m8xx_suspend(struct pcmcia_socket *sock)
+static int m8xx_sock_suspend(struct pcmcia_socket *sock)
 {
         return m8xx_set_socket(sock, &dead_socket);
 }
 
 static struct pccard_operations m8xx_services = {
         .init   = m8xx_sock_init,
-        .suspend = m8xx_suspend,
+        .suspend = m8xx_sock_suspend,
         .get_status = m8xx_get_status,
         .set_socket = m8xx_set_socket,
         .set_io_map = m8xx_set_io_map,
         .set_mem_map = m8xx_set_mem_map,
 };
 
-static int __init m8xx_init(void)
+static int __init m8xx_probe(struct of_device *ofdev, const struct of_device_id *match)
 {
         struct pcmcia_win *w;
-        unsigned int i,m;
+        unsigned int i, m, hwirq;
+        pcmconf8xx_t *pcmcia;
+        int status;
+        struct device_node *np = ofdev->node;
 
         pcmcia_info("%s\n", version);
 
-        if (driver_register(&m8xx_driver))
-                return -1;
+        pcmcia = of_iomap(np, 0);
+        if(pcmcia == NULL)
+                return -EINVAL;
+
+        pcmcia_schlvl = irq_of_parse_and_map(np, 0);
+        hwirq  = irq_map[pcmcia_schlvl].hwirq;
+        if (pcmcia_schlvl < 0)
+                return -EINVAL;
+
+        m8xx_pgcrx[0] = &pcmcia->pcmc_pgcra;
+        m8xx_pgcrx[1] = &pcmcia->pcmc_pgcrb;
+
 
         pcmcia_info(PCMCIA_BOARD_MSG " using " PCMCIA_SLOT_MSG
-                    " with IRQ %u.\n", pcmcia_schlvl);
+                    " with IRQ %u  (%d). \n", pcmcia_schlvl, hwirq);
 
         /* Configure Status change interrupt */
 
-        if(request_irq(pcmcia_schlvl, m8xx_interrupt, 0,
-                          "m8xx_pcmcia", NULL)) {
+        if(request_irq(pcmcia_schlvl, m8xx_interrupt, IRQF_SHARED,
+                          driver_name, socket)) {
                 pcmcia_error("Cannot allocate IRQ %u for SCHLVL!\n",
                              pcmcia_schlvl);
                 return -1;
         }
 
-        w = (void *) &((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pbr0;
-
-        out_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_pscr,
-                M8XX_PCMCIA_MASK(0)| M8XX_PCMCIA_MASK(1));
+        w = (void *) &pcmcia->pcmc_pbr0;
 
-        out_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per,
-                in_be32(&((immap_t *)IMAP_ADDR)->im_pcmcia.pcmc_per) &
-                ~(M8XX_PCMCIA_MASK(0)| M8XX_PCMCIA_MASK(1)));
+        out_be32(&pcmcia->pcmc_pscr, M8XX_PCMCIA_MASK(0)| M8XX_PCMCIA_MASK(1));
+        clrbits32(&pcmcia->pcmc_per, M8XX_PCMCIA_MASK(0) | M8XX_PCMCIA_MASK(1));
 
-/* connect interrupt and disable CxOE */
+        /* connect interrupt and disable CxOE */
 
-        out_be32(M8XX_PGCRX(0), M8XX_PGCRX_CXOE | (mk_int_int_mask(pcmcia_schlvl) << 16));
-        out_be32(M8XX_PGCRX(1), M8XX_PGCRX_CXOE | (mk_int_int_mask(pcmcia_schlvl) << 16));
+        out_be32(M8XX_PGCRX(0), M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16));
+        out_be32(M8XX_PGCRX(1), M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16));
 
-/* intialize the fixed memory windows */
+        /* intialize the fixed memory windows */
 
         for(i = 0; i < PCMCIA_SOCKETS_NO; i++){
-                for(m = 0; m < PCMCIA_MEM_WIN_NO; m++) {
+                for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) {
                         out_be32(&w->br, PCMCIA_MEM_WIN_BASE +
                                 (PCMCIA_MEM_WIN_SIZE
                                  * (m + i * PCMCIA_MEM_WIN_NO)));
@@ -1300,16 +1210,14 @@ static int __init m8xx_init(void)
                 }
         }
 
-/* turn off voltage */
+        /* turn off voltage */
         voltage_set(0, 0, 0);
         voltage_set(1, 0, 0);
 
-/* Enable external hardware */
+        /* Enable external hardware */
         hardware_enable(0);
         hardware_enable(1);
 
-        platform_device_register(&m8xx_device);
-
         for (i = 0 ; i < PCMCIA_SOCKETS_NO; i++) {
                 socket[i].slot = i;
                 socket[i].socket.owner = THIS_MODULE;
@@ -1317,30 +1225,105 @@ static int __init m8xx_init(void)
                 socket[i].socket.irq_mask = 0x000;
                 socket[i].socket.map_size = 0x1000;
                 socket[i].socket.io_offset = 0;
-                socket[i].socket.pci_irq = i  ? 7 : 9;
+                socket[i].socket.pci_irq = pcmcia_schlvl;
                 socket[i].socket.ops = &m8xx_services;
-                socket[i].socket.resource_ops = &pccard_iodyn_ops;
+                socket[i].socket.resource_ops = &pccard_nonstatic_ops;
                 socket[i].socket.cb_dev = NULL;
-                socket[i].socket.dev.parent = &m8xx_device.dev;
+                socket[i].socket.dev.parent = &ofdev->dev;
+                socket[i].pcmcia = pcmcia;
+                socket[i].bus_freq = ppc_proc_freq;
+                socket[i].hwirq = hwirq;
+
+
         }
 
-        for (i = 0; i < PCMCIA_SOCKETS_NO; i++)
-                pcmcia_register_socket(&socket[i].socket);
+        for (i = 0; i < PCMCIA_SOCKETS_NO; i++) {
+                status = pcmcia_register_socket(&socket[i].socket);
+                if (status < 0)
+                        pcmcia_error("Socket register failed\n");
+        }
 
         return 0;
 }
 
-static void __exit m8xx_exit(void)
+static int m8xx_remove(struct of_device* ofdev)
 {
-        int i;
+        u32 m, i;
+        struct pcmcia_win *w;
+        pcmconf8xx_t *pcmcia = socket[0].pcmcia;
+
+        for (i = 0; i < PCMCIA_SOCKETS_NO; i++) {
+                w = (void *) &pcmcia->pcmc_pbr0;
+
+                out_be32(&pcmcia->pcmc_pscr, M8XX_PCMCIA_MASK(i));
+                out_be32(&pcmcia->pcmc_per,
+                        in_be32(&pcmcia->pcmc_per) & ~M8XX_PCMCIA_MASK(i));
 
+                /* turn off interrupt and disable CxOE */
+                out_be32(M8XX_PGCRX(i), M8XX_PGCRX_CXOE);
+
+                /* turn off memory windows */
+                for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) {
+                        out_be32(&w->or, 0); /* set to not valid */
+                        w++;
+                }
+
+                /* turn off voltage */
+                voltage_set(i, 0, 0);
+
+                /* disable external hardware */
+                hardware_disable(i);
+        }
         for (i = 0; i < PCMCIA_SOCKETS_NO; i++)
                 pcmcia_unregister_socket(&socket[i].socket);
 
-        m8xx_shutdown();
+        free_irq(pcmcia_schlvl, NULL);
 
-        platform_device_unregister(&m8xx_device);
-        driver_unregister(&m8xx_driver);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int m8xx_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        return pcmcia_socket_dev_suspend(&pdev->dev, state);
+}
+
+static int m8xx_resume(struct platform_device *pdev)
+{
+        return pcmcia_socket_dev_resume(&pdev->dev);
+}
+#else
+#define m8xx_suspend NULL
+#define m8xx_resume NULL
+#endif
+
+static struct of_device_id m8xx_pcmcia_match[] = {
+        {
+                .type = "pcmcia",
+                .compatible = "fsl,pq-pcmcia",
+        },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, m8xx_pcmcia_match);
+
+static struct of_platform_driver m8xx_pcmcia_driver = {
+        .name           = (char *) driver_name,
+        .match_table    = m8xx_pcmcia_match,
+        .probe          = m8xx_probe,
+        .remove         = m8xx_remove,
+        .suspend        = m8xx_suspend,
+        .resume         = m8xx_resume,
+};
+
+static int __init m8xx_init(void)
+{
+        return of_register_platform_driver(&m8xx_pcmcia_driver);
+}
+
+static void __exit m8xx_exit(void)
+{
+        of_unregister_platform_driver(&m8xx_pcmcia_driver);
 }
 
 module_init(m8xx_init);