Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (68 commits)
  sdio_uart: Fix SDIO break control to now return success or an error
  mmc: host driver for Ricoh Bay1Controllers
  sdio: sdio_io.c Fix sparse warnings
  sdio: fix the use of hard coded timeout value.
  mmc: OLPC: update vdd/powerup quirk comment
  mmc: fix spares errors of sdhci.c
  mmc: remove multiwrite capability
  wbsd: fix bad dma_addr_t conversion
  atmel-mci: Driver for Atmel on-chip MMC controllers
  mmc: fix sdio_io sparse errors
  mmc: wbsd.c fix shadowing of 'dma' variable
  MMC: S3C24XX: Refuse incorrectly aligned transfers
  MMC: S3C24XX: Add maintainer entry
  MMC: S3C24XX: Update error debugging.
  MMC: S3C24XX: Add media presence test to request handling.
  MMC: S3C24XX: Fix use of msecs where jiffies are needed
  MMC: S3C24XX: Add MODULE_ALIAS() entries for the platform devices
  MMC: S3C24XX: Fix s3c2410_dma_request() return code check.
  MMC: S3C24XX: Allow card-detect on non-IRQ capable pin
  MMC: S3C24XX: Ensure host->mrq->data is valid
  ...

Manually fixed up bogus executable bits on drivers/mmc/core/sdio_io.c
and include/linux/mmc/sdio_func.h when merging.

1 files changed, 70 insertions, 0 deletions

diff --git a/drivers/mmc/host/s3cmci.h b/drivers/mmc/host/s3cmci.h
new file mode 100644
index 000000000000..37d9c60010c9
--- /dev/null
+++ b/drivers/mmc/host/s3cmci.h
@@ -0,0 +1,70 @@
+/*
+ *  linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
+ *
+ *  Copyright (C) 2004-2006 Thomas Kleffel, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* FIXME: DMA Resource management ?! */
+#define S3CMCI_DMA 0
+
+enum s3cmci_waitfor {
+        COMPLETION_NONE,
+        COMPLETION_FINALIZE,
+        COMPLETION_CMDSENT,
+        COMPLETION_RSPFIN,
+        COMPLETION_XFERFINISH,
+        COMPLETION_XFERFINISH_RSPFIN,
+};
+
+struct s3cmci_host {
+        struct platform_device  *pdev;
+        struct s3c24xx_mci_pdata *pdata;
+        struct mmc_host         *mmc;
+        struct resource         *mem;
+        struct clk              *clk;
+        void __iomem            *base;
+        int                     irq;
+        int                     irq_cd;
+        int                     dma;
+
+        unsigned long           clk_rate;
+        unsigned long           clk_div;
+        unsigned long           real_rate;
+        u8                      prescaler;
+
+        int                     is2440;
+        unsigned                sdiimsk;
+        unsigned                sdidata;
+        int                     dodma;
+        int                     dmatogo;
+
+        struct mmc_request      *mrq;
+        int                     cmd_is_stop;
+
+        spinlock_t              complete_lock;
+        enum s3cmci_waitfor     complete_what;
+
+        int                     dma_complete;
+
+        u32                     pio_sgptr;
+        u32                     pio_words;
+        u32                     pio_count;
+        u32                     *pio_ptr;
+#define XFER_NONE 0
+#define XFER_READ 1
+#define XFER_WRITE 2
+        u32                     pio_active;
+
+        int                     bus_width;
+
+        char                    dbgmsg_cmd[301];
+        char                    dbgmsg_dat[301];
+        char                    *status;
+
+        unsigned int            ccnt, dcnt;
+        struct tasklet_struct   pio_tasklet;
+};