au1xmmc: remove db1200 board code, rewrite probe.

Remove the DB1200 board-specific functions (card present, read-only,
activity LED methods) and instead add platform data which is passed
to the driver.  This also allows for platforms to implement other
carddetect schemes (e.g. dedicated irq) without having to pollute the
driver code.  The poll timer (used for pb1200) is kept for compatibility.

With the board-specific stuff gone, the driver's ->probe() code can be
cleaned up considerably.

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

2 files changed, 345 insertions, 237 deletions

diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index cc5f7bc546af..d8776d61b3cc 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -41,8 +41,9 @@
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
-
+#include <linux/leds.h>
 #include <linux/mmc/host.h>
+
 #include <asm/io.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
@@ -54,6 +55,7 @@
 #define DRIVER_NAME "au1xxx-mmc"
 
 /* Set this to enable special debugging macros */
+/* #define DEBUG */
 
 #ifdef DEBUG
 #define DBG(fmt, idx, args...) printk("au1xx(%d): DEBUG: " fmt, idx, ##args)
@@ -61,32 +63,6 @@
 #define DBG(fmt, idx, args...)
 #endif
 
-const struct {
-        u32 iobase;
-        u32 tx_devid, rx_devid;
-        u16 bcsrpwr;
-        u16 bcsrstatus;
-        u16 wpstatus;
-} au1xmmc_card_table[] = {
-        { SD0_BASE, DSCR_CMD0_SDMS_TX0, DSCR_CMD0_SDMS_RX0,
-          BCSR_BOARD_SD0PWR, BCSR_INT_SD0INSERT, BCSR_STATUS_SD0WP },
-#ifndef CONFIG_MIPS_DB1200
-        { SD1_BASE, DSCR_CMD0_SDMS_TX1, DSCR_CMD0_SDMS_RX1,
-          BCSR_BOARD_DS1PWR, BCSR_INT_SD1INSERT, BCSR_STATUS_SD1WP }
-#endif
-};
-
-#define AU1XMMC_CONTROLLER_COUNT (ARRAY_SIZE(au1xmmc_card_table))
-
-/* This array stores pointers for the hosts (used by the IRQ handler) */
-struct au1xmmc_host *au1xmmc_hosts[AU1XMMC_CONTROLLER_COUNT];
-static int dma = 1;
-
-#ifdef MODULE
-module_param(dma, bool, 0);
-MODULE_PARM_DESC(dma, "Use DMA engine for data transfers (0 = disabled)");
-#endif
-
 static inline void IRQ_ON(struct au1xmmc_host *host, u32 mask)
 {
         u32 val = au_readl(HOST_CONFIG(host));
@@ -135,26 +111,33 @@ static inline void SEND_STOP(struct au1xmmc_host *host)
 
 static void au1xmmc_set_power(struct au1xmmc_host *host, int state)
 {
-
-        u32 val = au1xmmc_card_table[host->id].bcsrpwr;
-
-        bcsr->board &= ~val;
-        if (state) bcsr->board |= val;
-
-        au_sync_delay(1);
+        if (host->platdata && host->platdata->set_power)
+                host->platdata->set_power(host->mmc, state);
 }
 
-static inline int au1xmmc_card_inserted(struct au1xmmc_host *host)
+static int au1xmmc_card_inserted(struct au1xmmc_host *host)
 {
-        return (bcsr->sig_status & au1xmmc_card_table[host->id].bcsrstatus)
-                ? 1 : 0;
+        int ret;
+
+        if (host->platdata && host->platdata->card_inserted)
+                ret = host->platdata->card_inserted(host->mmc);
+        else
+                ret = 1;        /* assume there is a card */
+
+        return ret;
 }
 
 static int au1xmmc_card_readonly(struct mmc_host *mmc)
 {
         struct au1xmmc_host *host = mmc_priv(mmc);
-        return (bcsr->status & au1xmmc_card_table[host->id].wpstatus)
-                ? 1 : 0;
+        int ret;
+
+        if (host->platdata && host->platdata->card_readonly)
+                ret = host->platdata->card_readonly(mmc);
+        else
+                ret = 0;        /* assume card is read-write */
+
+        return ret;
 }
 
 static void au1xmmc_finish_request(struct au1xmmc_host *host)
@@ -163,7 +146,7 @@ static void au1xmmc_finish_request(struct au1xmmc_host *host)
         struct mmc_request *mrq = host->mrq;
 
         host->mrq = NULL;
-        host->flags &= HOST_F_ACTIVE;
+        host->flags &= HOST_F_ACTIVE | HOST_F_DMA;
 
         host->dma.len = 0;
         host->dma.dir = 0;
@@ -174,8 +157,6 @@ static void au1xmmc_finish_request(struct au1xmmc_host *host)
 
         host->status = HOST_S_IDLE;
 
-        bcsr->disk_leds |= (1 << 8);
-
         mmc_request_done(host->mmc, mrq);
 }
 
@@ -299,11 +280,13 @@ static void au1xmmc_data_complete(struct au1xmmc_host *host, u32 status)
 
         if (!data->error) {
                 if (host->flags & HOST_F_DMA) {
+#ifdef CONFIG_SOC_AU1200        /* DBDMA */
                         u32 chan = DMA_CHANNEL(host);
 
                         chan_tab_t *c = *((chan_tab_t **) chan);
                         au1x_dma_chan_t *cp = c->chan_ptr;
                         data->bytes_xfered = cp->ddma_bytecnt;
+#endif
                 }
                 else
                         data->bytes_xfered =
@@ -420,18 +403,18 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host)
                         break;
 
                 if (status & SD_STATUS_RC) {
-                        DBG("RX CRC Error [%d + %d].\n", host->id,
+                        DBG("RX CRC Error [%d + %d].\n", host->pdev->id,
                                         host->pio.len, count);
                         break;
                 }
 
                 if (status & SD_STATUS_RO) {
-                        DBG("RX Overrun [%d + %d]\n", host->id,
+                        DBG("RX Overrun [%d + %d]\n", host->pdev->id,
                                         host->pio.len, count);
                         break;
                 }
                 else if (status & SD_STATUS_RU) {
-                        DBG("RX Underrun [%d + %d]\n", host->id,
+                        DBG("RX Underrun [%d + %d]\n", host->pdev->id,
                                         host->pio.len,  count);
                         break;
                 }
@@ -528,6 +511,7 @@ static void au1xmmc_cmd_complete(struct au1xmmc_host *host, u32 status)
         host->status = HOST_S_DATA;
 
         if (host->flags & HOST_F_DMA) {
+#ifdef CONFIG_SOC_AU1200        /* DBDMA */
                 u32 channel = DMA_CHANNEL(host);
 
                 /* Start the DMA as soon as the buffer gets something in it */
@@ -540,6 +524,7 @@ static void au1xmmc_cmd_complete(struct au1xmmc_host *host, u32 status)
                 }
 
                 au1xxx_dbdma_start(channel);
+#endif
         }
 }
 
@@ -571,12 +556,8 @@ static void au1xmmc_set_clock(struct au1xmmc_host *host, int rate)
 static int
 au1xmmc_prepare_data(struct au1xmmc_host *host, struct mmc_data *data)
 {
-
         int datalen = data->blocks * data->blksz;
 
-        if (dma != 0)
-                host->flags |= HOST_F_DMA;
-
         if (data->flags & MMC_DATA_READ)
                 host->flags |= HOST_F_RECV;
         else
@@ -596,6 +577,7 @@ au1xmmc_prepare_data(struct au1xmmc_host *host, struct mmc_data *data)
         au_writel(data->blksz - 1, HOST_BLKSIZE(host));
 
         if (host->flags & HOST_F_DMA) {
+#ifdef CONFIG_SOC_AU1200        /* DBDMA */
                 int i;
                 u32 channel = DMA_CHANNEL(host);
 
@@ -621,11 +603,12 @@ au1xmmc_prepare_data(struct au1xmmc_host *host, struct mmc_data *data)
                                         len, flags);
                         }
 
-                        if (!ret)
+                        if (!ret)
                                 goto dataerr;
 
                         datalen -= len;
                 }
+#endif
         }
         else {
                 host->pio.index = 0;
@@ -641,8 +624,9 @@ au1xmmc_prepare_data(struct au1xmmc_host *host, struct mmc_data *data)
 
         return 0;
 
- dataerr:
-        dma_unmap_sg(mmc_dev(host->mmc),data->sg,data->sg_len,host->dma.dir);
+dataerr:
+        dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
+                        host->dma.dir);
         return -ETIMEDOUT;
 }
 
@@ -663,8 +647,6 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
         host->mrq = mrq;
         host->status = HOST_S_CMD;
 
-        bcsr->disk_leds &= ~(1 << 8);
-
         if (mrq->data) {
                 FLUSH_FIFO(host);
                 flags = mrq->data->flags;
@@ -728,149 +710,145 @@ static void au1xmmc_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
         }
 }
 
-static void au1xmmc_dma_callback(int irq, void *dev_id)
-{
-        struct au1xmmc_host *host = (struct au1xmmc_host *) dev_id;
-
-        /* Avoid spurious interrupts */
-
-        if (!host->mrq)
-                return;
-
-        if (host->flags & HOST_F_STOP)
-                SEND_STOP(host);
-
-        tasklet_schedule(&host->data_task);
-}
-
 #define STATUS_TIMEOUT (SD_STATUS_RAT | SD_STATUS_DT)
 #define STATUS_DATA_IN  (SD_STATUS_NE)
 #define STATUS_DATA_OUT (SD_STATUS_TH)
 
 static irqreturn_t au1xmmc_irq(int irq, void *dev_id)
 {
-
+        struct au1xmmc_host *host = dev_id;
         u32 status;
-        int i, ret = 0;
-
-        disable_irq(AU1100_SD_IRQ);
 
-        for(i = 0; i < AU1XMMC_CONTROLLER_COUNT; i++) {
-                struct au1xmmc_host * host = au1xmmc_hosts[i];
-                u32 handled = 1;
-
-                status = au_readl(HOST_STATUS(host));
+        status = au_readl(HOST_STATUS(host));
 
-                if (host->mrq && (status & STATUS_TIMEOUT)) {
-                        if (status & SD_STATUS_RAT)
-                                host->mrq->cmd->error = -ETIMEDOUT;
+        if (!(status & SD_STATUS_I))
+                return IRQ_NONE;        /* not ours */
 
-                        else if (status & SD_STATUS_DT)
-                                host->mrq->data->error = -ETIMEDOUT;
+        if (host->mrq && (status & STATUS_TIMEOUT)) {
+                if (status & SD_STATUS_RAT)
+                        host->mrq->cmd->error = -ETIMEDOUT;
+                else if (status & SD_STATUS_DT)
+                        host->mrq->data->error = -ETIMEDOUT;
 
-                        /* In PIO mode, interrupts might still be enabled */
-                        IRQ_OFF(host, SD_CONFIG_NE | SD_CONFIG_TH);
+                /* In PIO mode, interrupts might still be enabled */
+                IRQ_OFF(host, SD_CONFIG_NE | SD_CONFIG_TH);
 
-                        //IRQ_OFF(host, SD_CONFIG_TH|SD_CONFIG_RA|SD_CONFIG_RF);
-                        tasklet_schedule(&host->finish_task);
-                }
+                /* IRQ_OFF(host, SD_CONFIG_TH | SD_CONFIG_RA | SD_CONFIG_RF); */
+                tasklet_schedule(&host->finish_task);
+        }
 #if 0
-                else if (status & SD_STATUS_DD) {
-
-                        /* Sometimes we get a DD before a NE in PIO mode */
-
-                        if (!(host->flags & HOST_F_DMA) &&
-                                        (status & SD_STATUS_NE))
-                                au1xmmc_receive_pio(host);
-                        else {
-                                au1xmmc_data_complete(host, status);
-                                //tasklet_schedule(&host->data_task);
-                        }
-                }
-#endif
-                else if (status & (SD_STATUS_CR)) {
-                        if (host->status == HOST_S_CMD)
-                                au1xmmc_cmd_complete(host,status);
-                }
-                else if (!(host->flags & HOST_F_DMA)) {
-                        if ((host->flags & HOST_F_XMIT) &&
-                            (status & STATUS_DATA_OUT))
-                                au1xmmc_send_pio(host);
-                        else if ((host->flags & HOST_F_RECV) &&
-                            (status & STATUS_DATA_IN))
-                                au1xmmc_receive_pio(host);
-                }
-                else if (status & 0x203FBC70) {
-                        DBG("Unhandled status %8.8x\n", host->id, status);
-                        handled = 0;
+        else if (status & SD_STATUS_DD) {
+                /* Sometimes we get a DD before a NE in PIO mode */
+                if (!(host->flags & HOST_F_DMA) && (status & SD_STATUS_NE))
+                        au1xmmc_receive_pio(host);
+                else {
+                        au1xmmc_data_complete(host, status);
+                        /* tasklet_schedule(&host->data_task); */
                 }
-
-                au_writel(status, HOST_STATUS(host));
-                au_sync();
-
-                ret |= handled;
         }
-
-        enable_irq(AU1100_SD_IRQ);
-        return ret;
-}
-
-static void au1xmmc_poll_event(unsigned long arg)
-{
-        struct au1xmmc_host *host = (struct au1xmmc_host *) arg;
-
-        int card = au1xmmc_card_inserted(host);
-        int controller = (host->flags & HOST_F_ACTIVE) ? 1 : 0;
-
-        if (card != controller) {
-                host->flags &= ~HOST_F_ACTIVE;
-                if (card) host->flags |= HOST_F_ACTIVE;
-                mmc_detect_change(host->mmc, 0);
+#endif
+        else if (status & SD_STATUS_CR) {
+                if (host->status == HOST_S_CMD)
+                        au1xmmc_cmd_complete(host, status);
+
+        } else if (!(host->flags & HOST_F_DMA)) {
+                if ((host->flags & HOST_F_XMIT) && (status & STATUS_DATA_OUT))
+                        au1xmmc_send_pio(host);
+                else if ((host->flags & HOST_F_RECV) && (status & STATUS_DATA_IN))
+                        au1xmmc_receive_pio(host);
+
+        } else if (status & 0x203F3C70) {
+                        DBG("Unhandled status %8.8x\n", host->pdev->id,
+                                status);
         }
 
-        if (host->mrq != NULL) {
-                u32 status = au_readl(HOST_STATUS(host));
-                DBG("PENDING - %8.8x\n", host->id, status);
-        }
+        au_writel(status, HOST_STATUS(host));
+        au_sync();
 
-        mod_timer(&host->timer, jiffies + AU1XMMC_DETECT_TIMEOUT);
+        return IRQ_HANDLED;
 }
 
-static dbdev_tab_t au1xmmc_mem_dbdev =
-{
-        DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 8, 0x00000000, 0, 0
+#ifdef CONFIG_SOC_AU1200
+/* 8bit memory DMA device */
+static dbdev_tab_t au1xmmc_mem_dbdev = {
+        .dev_id         = DSCR_CMD0_ALWAYS,
+        .dev_flags      = DEV_FLAGS_ANYUSE,
+        .dev_tsize      = 0,
+        .dev_devwidth   = 8,
+        .dev_physaddr   = 0x00000000,
+        .dev_intlevel   = 0,
+        .dev_intpolarity = 0,
 };
+static int memid;
 
-static void au1xmmc_init_dma(struct au1xmmc_host *host)
+static void au1xmmc_dbdma_callback(int irq, void *dev_id)
 {
+        struct au1xmmc_host *host = (struct au1xmmc_host *)dev_id;
 
-        u32 rxchan, txchan;
+        /* Avoid spurious interrupts */
+        if (!host->mrq)
+                return;
 
-        int txid = au1xmmc_card_table[host->id].tx_devid;
-        int rxid = au1xmmc_card_table[host->id].rx_devid;
+        if (host->flags & HOST_F_STOP)
+                SEND_STOP(host);
 
-        /* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
-           of 8 bits.  And since devices are shared, we need to create
-           our own to avoid freaking out other devices
-        */
+        tasklet_schedule(&host->data_task);
+}
 
-        int memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
+static int au1xmmc_dbdma_init(struct au1xmmc_host *host)
+{
+        struct resource *res;
+        int txid, rxid;
+
+        res = platform_get_resource(host->pdev, IORESOURCE_DMA, 0);
+        if (!res)
+                return -ENODEV;
+        txid = res->start;
+
+        res = platform_get_resource(host->pdev, IORESOURCE_DMA, 1);
+        if (!res)
+                return -ENODEV;
+        rxid = res->start;
+
+        if (!memid)
+                return -ENODEV;
+
+        host->tx_chan = au1xxx_dbdma_chan_alloc(memid, txid,
+                                au1xmmc_dbdma_callback, (void *)host);
+        if (!host->tx_chan) {
+                dev_err(&host->pdev->dev, "cannot allocate TX DMA\n");
+                return -ENODEV;
+        }
+
+        host->rx_chan = au1xxx_dbdma_chan_alloc(rxid, memid,
+                                au1xmmc_dbdma_callback, (void *)host);
+        if (!host->rx_chan) {
+                dev_err(&host->pdev->dev, "cannot allocate RX DMA\n");
+                au1xxx_dbdma_chan_free(host->tx_chan);
+                return -ENODEV;
+        }
 
-        txchan = au1xxx_dbdma_chan_alloc(memid, txid,
-                                         au1xmmc_dma_callback, (void *) host);
+        au1xxx_dbdma_set_devwidth(host->tx_chan, 8);
+        au1xxx_dbdma_set_devwidth(host->rx_chan, 8);
 
-        rxchan = au1xxx_dbdma_chan_alloc(rxid, memid,
-                                         au1xmmc_dma_callback, (void *) host);
+        au1xxx_dbdma_ring_alloc(host->tx_chan, AU1XMMC_DESCRIPTOR_COUNT);
+        au1xxx_dbdma_ring_alloc(host->rx_chan, AU1XMMC_DESCRIPTOR_COUNT);
 
-        au1xxx_dbdma_set_devwidth(txchan, 8);
-        au1xxx_dbdma_set_devwidth(rxchan, 8);
+        /* DBDMA is good to go */
+        host->flags |= HOST_F_DMA;
 
-        au1xxx_dbdma_ring_alloc(txchan, AU1XMMC_DESCRIPTOR_COUNT);
-        au1xxx_dbdma_ring_alloc(rxchan, AU1XMMC_DESCRIPTOR_COUNT);
+        return 0;
+}
 
-        host->tx_chan = txchan;
-        host->rx_chan = rxchan;
+static void au1xmmc_dbdma_shutdown(struct au1xmmc_host *host)
+{
+        if (host->flags & HOST_F_DMA) {
+                host->flags &= ~HOST_F_DMA;
+                au1xxx_dbdma_chan_free(host->tx_chan);
+                au1xxx_dbdma_chan_free(host->rx_chan);
+        }
 }
+#endif
 
 static const struct mmc_host_ops au1xmmc_ops = {
         .request        = au1xmmc_request,
@@ -878,116 +856,235 @@ static const struct mmc_host_ops au1xmmc_ops = {
         .get_ro         = au1xmmc_card_readonly,
 };
 
-static int __devinit au1xmmc_probe(struct platform_device *pdev)
+static void au1xmmc_poll_event(unsigned long arg)
 {
+        struct au1xmmc_host *host = (struct au1xmmc_host *)arg;
+        int card = au1xmmc_card_inserted(host);
+        int controller = (host->flags & HOST_F_ACTIVE) ? 1 : 0;
+
+        if (card != controller) {
+                host->flags &= ~HOST_F_ACTIVE;
+                if (card)
+                        host->flags |= HOST_F_ACTIVE;
+                mmc_detect_change(host->mmc, 0);
+        }
 
-        int i, ret = 0;
+#ifdef DEBUG
+        if (host->mrq != NULL) {
+                u32 status = au_readl(HOST_STATUS(host));
+                DBG("PENDING - %8.8x\n", host->pdev->id, status);
+        }
+#endif
+        mod_timer(&host->timer, jiffies + AU1XMMC_DETECT_TIMEOUT);
+}
 
-        /* THe interrupt is shared among all controllers */
-        ret = request_irq(AU1100_SD_IRQ, au1xmmc_irq, IRQF_DISABLED, "MMC", 0);
+static void au1xmmc_init_cd_poll_timer(struct au1xmmc_host *host)
+{
+        init_timer(&host->timer);
+        host->timer.function = au1xmmc_poll_event;
+        host->timer.data = (unsigned long)host;
+        host->timer.expires = jiffies + AU1XMMC_DETECT_TIMEOUT;
+}
 
-        if (ret) {
-                printk(DRIVER_NAME "ERROR: Couldn't get int %d: %d\n",
-                                AU1100_SD_IRQ, ret);
-                return -ENXIO;
+static int __devinit au1xmmc_probe(struct platform_device *pdev)
+{
+        struct mmc_host *mmc;
+        struct au1xmmc_host *host;
+        struct resource *r;
+        int ret;
+
+        mmc = mmc_alloc_host(sizeof(struct au1xmmc_host), &pdev->dev);
+        if (!mmc) {
+                dev_err(&pdev->dev, "no memory for mmc_host\n");
+                ret = -ENOMEM;
+                goto out0;
         }
 
-        disable_irq(AU1100_SD_IRQ);
+        host = mmc_priv(mmc);
+        host->mmc = mmc;
+        host->platdata = pdev->dev.platform_data;
+        host->pdev = pdev;
 
-        for(i = 0; i < AU1XMMC_CONTROLLER_COUNT; i++) {
-                struct mmc_host *mmc = mmc_alloc_host(sizeof(struct au1xmmc_host), &pdev->dev);
-                struct au1xmmc_host *host = 0;
+        ret = -ENODEV;
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!r) {
+                dev_err(&pdev->dev, "no mmio defined\n");
+                goto out1;
+        }
 
-                if (!mmc) {
-                        printk(DRIVER_NAME "ERROR: no mem for host %d\n", i);
-                        au1xmmc_hosts[i] = 0;
-                        continue;
-                }
+        host->ioarea = request_mem_region(r->start, r->end - r->start + 1,
+                                           pdev->name);
+        if (!host->ioarea) {
+                dev_err(&pdev->dev, "mmio already in use\n");
+                goto out1;
+        }
 
-                mmc->ops = &au1xmmc_ops;
+        host->iobase = (unsigned long)ioremap(r->start, 0x3c);
+        if (!host->iobase) {
+                dev_err(&pdev->dev, "cannot remap mmio\n");
+                goto out2;
+        }
+
+        r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!r) {
+                dev_err(&pdev->dev, "no IRQ defined\n");
+                goto out3;
+        }
 
-                mmc->f_min =   450000;
-                mmc->f_max = 24000000;
+        host->irq = r->start;
+        /* IRQ is shared among both SD controllers */
+        ret = request_irq(host->irq, au1xmmc_irq, IRQF_SHARED,
+                          DRIVER_NAME, host);
+        if (ret) {
+                dev_err(&pdev->dev, "cannot grab IRQ\n");
+                goto out3;
+        }
 
-                mmc->max_seg_size = AU1XMMC_DESCRIPTOR_SIZE;
-                mmc->max_phys_segs = AU1XMMC_DESCRIPTOR_COUNT;
+        mmc->ops = &au1xmmc_ops;
 
-                mmc->max_blk_size = 2048;
-                mmc->max_blk_count = 512;
+        mmc->f_min =   450000;
+        mmc->f_max = 24000000;
 
-                mmc->ocr_avail = AU1XMMC_OCR;
+        mmc->max_seg_size = AU1XMMC_DESCRIPTOR_SIZE;
+        mmc->max_phys_segs = AU1XMMC_DESCRIPTOR_COUNT;
 
-                host = mmc_priv(mmc);
-                host->mmc = mmc;
+        mmc->max_blk_size = 2048;
+        mmc->max_blk_count = 512;
 
-                host->id = i;
-                host->iobase = au1xmmc_card_table[host->id].iobase;
-                host->clock = 0;
-                host->power_mode = MMC_POWER_OFF;
+        mmc->ocr_avail = AU1XMMC_OCR;
+        mmc->caps = 0;
 
-                host->flags = au1xmmc_card_inserted(host) ? HOST_F_ACTIVE : 0;
-                host->status = HOST_S_IDLE;
+        host->status = HOST_S_IDLE;
 
-                init_timer(&host->timer);
+        /* board-specific carddetect setup, if any */
+        if (host->platdata && host->platdata->cd_setup) {
+                ret = host->platdata->cd_setup(mmc, 1);
+                if (ret) {
+                        dev_err(&pdev->dev, "board CD setup failed\n");
+                        goto out4;
+                }
+        } else {
+                /* poll the board-specific is-card-in-socket-? method */
+                au1xmmc_init_cd_poll_timer(host);
+        }
 
-                host->timer.function = au1xmmc_poll_event;
-                host->timer.data = (unsigned long) host;
-                host->timer.expires = jiffies + AU1XMMC_DETECT_TIMEOUT;
+        tasklet_init(&host->data_task, au1xmmc_tasklet_data,
+                        (unsigned long)host);
 
-                tasklet_init(&host->data_task, au1xmmc_tasklet_data,
-                                (unsigned long) host);
+        tasklet_init(&host->finish_task, au1xmmc_tasklet_finish,
+                        (unsigned long)host);
 
-                tasklet_init(&host->finish_task, au1xmmc_tasklet_finish,
-                                (unsigned long) host);
+#ifdef CONFIG_SOC_AU1200
+        ret = au1xmmc_dbdma_init(host);
+        if (ret)
+                printk(KERN_INFO DRIVER_NAME ": DBDMA init failed; using PIO\n");
+#endif
 
-                spin_lock_init(&host->lock);
+#ifdef CONFIG_LEDS_CLASS
+        if (host->platdata && host->platdata->led) {
+                struct led_classdev *led = host->platdata->led;
+                led->name = mmc_hostname(mmc);
+                led->brightness = LED_OFF;
+                led->default_trigger = mmc_hostname(mmc);
+                ret = led_classdev_register(mmc_dev(mmc), led);
+                if (ret)
+                        goto out5;
+        }
+#endif
 
-                if (dma != 0)
-                        au1xmmc_init_dma(host);
+        au1xmmc_reset_controller(host);
 
-                au1xmmc_reset_controller(host);
+        ret = mmc_add_host(mmc);
+        if (ret) {
+                dev_err(&pdev->dev, "cannot add mmc host\n");
+                goto out6;
+        }
 
-                mmc_add_host(mmc);
-                au1xmmc_hosts[i] = host;
+        platform_set_drvdata(pdev, mmc);
 
+        /* start the carddetect poll timer if necessary */
+        if (!(host->platdata && host->platdata->cd_setup))
                 add_timer(&host->timer);
 
-                printk(KERN_INFO DRIVER_NAME ": MMC Controller %d set up at %8.8X (mode=%s)\n",
-                       host->id, host->iobase, dma ? "dma" : "pio");
-        }
+        printk(KERN_INFO DRIVER_NAME ": MMC Controller %d set up at %8.8X"
+                " (mode=%s)\n", pdev->id, host->iobase,
+                host->flags & HOST_F_DMA ? "dma" : "pio");
 
-        enable_irq(AU1100_SD_IRQ);
+        return 0;       /* all ok */
 
-        return 0;
+out6:
+#ifdef CONFIG_LEDS_CLASS
+        if (host->platdata && host->platdata->led)
+                led_classdev_unregister(host->platdata->led);
+out5:
+#endif
+        au_writel(0, HOST_ENABLE(host));
+        au_writel(0, HOST_CONFIG(host));
+        au_writel(0, HOST_CONFIG2(host));
+        au_sync();
+
+#ifdef CONFIG_SOC_AU1200
+        au1xmmc_dbdma_shutdown(host);
+#endif
+
+        tasklet_kill(&host->data_task);
+        tasklet_kill(&host->finish_task);
+
+        if (host->platdata && host->platdata->cd_setup)
+                host->platdata->cd_setup(mmc, 0);
+out4:
+        free_irq(host->irq, host);
+out3:
+        iounmap((void *)host->iobase);
+out2:
+        release_resource(host->ioarea);
+        kfree(host->ioarea);
+out1:
+        mmc_free_host(mmc);
+out0:
+        return ret;
 }
 
 static int __devexit au1xmmc_remove(struct platform_device *pdev)
 {
+        struct mmc_host *mmc = platform_get_drvdata(pdev);
+        struct au1xmmc_host *host;
+
+        if (mmc) {
+                host  = mmc_priv(mmc);
+
+                mmc_remove_host(mmc);
 
-        int i;
+#ifdef CONFIG_LEDS_CLASS
+                if (host->platdata && host->platdata->led)
+                        led_classdev_unregister(host->platdata->led);
+#endif
 
-        disable_irq(AU1100_SD_IRQ);
+                if (host->platdata && host->platdata->cd_setup)
+                        host->platdata->cd_setup(mmc, 0);
+                else
+                        del_timer_sync(&host->timer);
 
-        for(i = 0; i < AU1XMMC_CONTROLLER_COUNT; i++) {
-                struct au1xmmc_host *host = au1xmmc_hosts[i];
-                if (!host) continue;
+                au_writel(0, HOST_ENABLE(host));
+                au_writel(0, HOST_CONFIG(host));
+                au_writel(0, HOST_CONFIG2(host));
+                au_sync();
 
                 tasklet_kill(&host->data_task);
                 tasklet_kill(&host->finish_task);
 
-                del_timer_sync(&host->timer);
+#ifdef CONFIG_SOC_AU1200
+                au1xmmc_dbdma_shutdown(host);
+#endif
                 au1xmmc_set_power(host, 0);
 
-                mmc_remove_host(host->mmc);
+                free_irq(host->irq, host);
+                iounmap((void *)host->iobase);
+                release_resource(host->ioarea);
+                kfree(host->ioarea);
 
-                au1xxx_dbdma_chan_free(host->tx_chan);
-                au1xxx_dbdma_chan_free(host->rx_chan);
-
-                au_writel(0x0, HOST_ENABLE(host));
-                au_sync();
+                mmc_free_host(mmc);
         }
-
-        free_irq(AU1100_SD_IRQ, 0);
         return 0;
 }
 
@@ -1004,21 +1101,31 @@ static struct platform_driver au1xmmc_driver = {
 
 static int __init au1xmmc_init(void)
 {
+#ifdef CONFIG_SOC_AU1200
+        /* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
+         * of 8 bits.  And since devices are shared, we need to create
+         * our own to avoid freaking out other devices.
+         */
+        memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
+        if (!memid)
+                printk(KERN_ERR "au1xmmc: cannot add memory dbdma dev\n");
+#endif
         return platform_driver_register(&au1xmmc_driver);
 }
 
 static void __exit au1xmmc_exit(void)
 {
+#ifdef CONFIG_SOC_AU1200
+        if (memid)
+                au1xxx_ddma_del_device(memid);
+#endif
         platform_driver_unregister(&au1xmmc_driver);
 }
 
 module_init(au1xmmc_init);
 module_exit(au1xmmc_exit);
 
-#ifdef MODULE
 MODULE_AUTHOR("Advanced Micro Devices, Inc");
 MODULE_DESCRIPTION("MMC/SD driver for the Alchemy Au1XXX");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:au1xxx-mmc");
-#endif
-
diff --git a/drivers/mmc/host/au1xmmc.h b/drivers/mmc/host/au1xmmc.h
index 341cbdf0baca..3b400654e59c 100644
--- a/drivers/mmc/host/au1xmmc.h
+++ b/drivers/mmc/host/au1xmmc.h
@@ -49,8 +49,6 @@ struct au1xmmc_host {
   struct mmc_host *mmc;
   struct mmc_request *mrq;
 
-  u32 id;
-
   u32 flags;
   u32 iobase;
   u32 clock;
@@ -73,11 +71,14 @@ struct au1xmmc_host {
   u32 tx_chan;
   u32 rx_chan;
 
+  int irq;
+
   struct timer_list timer;
   struct tasklet_struct finish_task;
   struct tasklet_struct data_task;
-
-  spinlock_t lock;
+  struct au1xmmc_platform_data *platdata;
+  struct platform_device *pdev;
+  struct resource *ioarea;
 };
 
 /* Status flags used by the host structure */