7 files changed, 484 insertions, 26 deletions

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index badf702fcff4..0d508ac17d64 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -55,7 +55,28 @@ struct sd_switch_caps {
         unsigned int            hs_max_dtr;
 };
 
+struct sdio_cccr {
+        unsigned int            sdio_vsn;
+        unsigned int            sd_vsn;
+        unsigned int            multi_block:1,
+                                low_speed:1,
+                                wide_bus:1,
+                                high_power:1,
+                                high_speed:1;
+};
+
+struct sdio_cis {
+        unsigned short          vendor;
+        unsigned short          device;
+        unsigned short          blksize;
+        unsigned int            max_dtr;
+};
+
 struct mmc_host;
+struct sdio_func;
+struct sdio_func_tuple;
+
+#define SDIO_MAX_FUNCS          7
 
 /*
  * MMC device
@@ -67,11 +88,13 @@ struct mmc_card {
         unsigned int            type;           /* card type */
 #define MMC_TYPE_MMC            0               /* MMC card */
 #define MMC_TYPE_SD             1               /* SD card */
+#define MMC_TYPE_SDIO           2               /* SDIO card */
         unsigned int            state;          /* (our) card state */
 #define MMC_STATE_PRESENT       (1<<0)          /* present in sysfs */
 #define MMC_STATE_READONLY      (1<<1)          /* card is read-only */
 #define MMC_STATE_HIGHSPEED     (1<<2)          /* card is in high speed mode */
 #define MMC_STATE_BLOCKADDR     (1<<3)          /* card uses block-addressing */
+
         u32                     raw_cid[4];     /* raw card CID */
         u32                     raw_csd[4];     /* raw card CSD */
         u32                     raw_scr[2];     /* raw card SCR */
@@ -80,10 +103,19 @@ struct mmc_card {
         struct mmc_ext_csd      ext_csd;        /* mmc v4 extended card specific */
         struct sd_scr           scr;            /* extra SD information */
         struct sd_switch_caps   sw_caps;        /* switch (CMD6) caps */
+
+        unsigned int            sdio_funcs;     /* number of SDIO functions */
+        struct sdio_cccr        cccr;           /* common card info */
+        struct sdio_cis         cis;            /* common tuple info */
+        struct sdio_func        *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */
+        unsigned                num_info;       /* number of info strings */
+        const char              **info;         /* info strings */
+        struct sdio_func_tuple  *tuples;        /* unknown common tuples */
 };
 
 #define mmc_card_mmc(c)         ((c)->type == MMC_TYPE_MMC)
 #define mmc_card_sd(c)          ((c)->type == MMC_TYPE_SD)
+#define mmc_card_sdio(c)        ((c)->type == MMC_TYPE_SDIO)
 
 #define mmc_card_present(c)     ((c)->state & MMC_STATE_PRESENT)
 #define mmc_card_readonly(c)    ((c)->state & MMC_STATE_READONLY)
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 04bbe12fae8d..d0c3abed74c2 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -25,14 +25,20 @@ struct mmc_command {
 #define MMC_RSP_CRC     (1 << 2)                /* expect valid crc */
 #define MMC_RSP_BUSY    (1 << 3)                /* card may send busy */
 #define MMC_RSP_OPCODE  (1 << 4)                /* response contains opcode */
-#define MMC_CMD_MASK    (3 << 5)                /* command type */
+
+#define MMC_CMD_MASK    (3 << 5)                /* non-SPI command type */
 #define MMC_CMD_AC      (0 << 5)
 #define MMC_CMD_ADTC    (1 << 5)
 #define MMC_CMD_BC      (2 << 5)
 #define MMC_CMD_BCR     (3 << 5)
 
+#define MMC_RSP_SPI_S1  (1 << 7)                /* one status byte */
+#define MMC_RSP_SPI_S2  (1 << 8)                /* second byte */
+#define MMC_RSP_SPI_B4  (1 << 9)                /* four data bytes */
+#define MMC_RSP_SPI_BUSY (1 << 10)              /* card may send busy */
+
 /*
- * These are the response types, and correspond to valid bit
+ * These are the native response types, and correspond to valid bit
  * patterns of the above flags.  One additional valid pattern
  * is all zeros, which means we don't expect a response.
  */
@@ -41,12 +47,30 @@ struct mmc_command {
 #define MMC_RSP_R1B     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)
 #define MMC_RSP_R2      (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)
 #define MMC_RSP_R3      (MMC_RSP_PRESENT)
+#define MMC_RSP_R4      (MMC_RSP_PRESENT)
+#define MMC_RSP_R5      (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
 #define MMC_RSP_R6      (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
 #define MMC_RSP_R7      (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
 
 #define mmc_resp_type(cmd)      ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))
 
 /*
+ * These are the SPI response types for MMC, SD, and SDIO cards.
+ * Commands return R1, with maybe more info.  Zero is an error type;
+ * callers must always provide the appropriate MMC_RSP_SPI_Rx flags.
+ */
+#define MMC_RSP_SPI_R1  (MMC_RSP_SPI_S1)
+#define MMC_RSP_SPI_R1B (MMC_RSP_SPI_S1|MMC_RSP_SPI_BUSY)
+#define MMC_RSP_SPI_R2  (MMC_RSP_SPI_S1|MMC_RSP_SPI_S2)
+#define MMC_RSP_SPI_R3  (MMC_RSP_SPI_S1|MMC_RSP_SPI_B4)
+#define MMC_RSP_SPI_R4  (MMC_RSP_SPI_S1|MMC_RSP_SPI_B4)
+#define MMC_RSP_SPI_R5  (MMC_RSP_SPI_S1|MMC_RSP_SPI_S2)
+#define MMC_RSP_SPI_R7  (MMC_RSP_SPI_S1|MMC_RSP_SPI_B4)
+
+#define mmc_spi_resp_type(cmd)  ((cmd)->flags & \
+                (MMC_RSP_SPI_S1|MMC_RSP_SPI_BUSY|MMC_RSP_SPI_S2|MMC_RSP_SPI_B4))
+
+/*
  * These are the command types.
  */
 #define mmc_cmd_type(cmd)       ((cmd)->flags & MMC_CMD_MASK)
@@ -54,12 +78,19 @@ struct mmc_command {
         unsigned int            retries;        /* max number of retries */
         unsigned int            error;          /* command error */
 
-#define MMC_ERR_NONE    0
-#define MMC_ERR_TIMEOUT 1
-#define MMC_ERR_BADCRC  2
-#define MMC_ERR_FIFO    3
-#define MMC_ERR_FAILED  4
-#define MMC_ERR_INVALID 5
+/*
+ * Standard errno values are used for errors, but some have specific
+ * meaning in the MMC layer:
+ *
+ * ETIMEDOUT    Card took too long to respond
+ * EILSEQ       Basic format problem with the received or sent data
+ *              (e.g. CRC check failed, incorrect opcode in response
+ *              or bad end bit)
+ * EINVAL       Request cannot be performed because of restrictions
+ *              in hardware and/or the driver
+ * ENOMEDIUM    Host can determine that the slot is empty and is
+ *              actively failing requests
+ */
 
         struct mmc_data         *data;          /* data segment associated with cmd */
         struct mmc_request      *mrq;           /* associated request */
@@ -76,7 +107,6 @@ struct mmc_data {
 #define MMC_DATA_WRITE  (1 << 8)
 #define MMC_DATA_READ   (1 << 9)
 #define MMC_DATA_STREAM (1 << 10)
-#define MMC_DATA_MULTI  (1 << 11)
 
         unsigned int            bytes_xfered;
 
@@ -99,14 +129,25 @@ struct mmc_request {
 struct mmc_host;
 struct mmc_card;
 
-extern int mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
+extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
 extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
 extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
         struct mmc_command *, int);
 
-extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *, int);
+extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *);
 
-extern void mmc_claim_host(struct mmc_host *host);
+extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);
 
+/**
+ *      mmc_claim_host - exclusively claim a host
+ *      @host: mmc host to claim
+ *
+ *      Claim a host for a set of operations.
+ */
+static inline void mmc_claim_host(struct mmc_host *host)
+{
+        __mmc_claim_host(host, NULL);
+}
+
 #endif
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index b1350dfd3e91..125eee1407ff 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -10,6 +10,8 @@
 #ifndef LINUX_MMC_HOST_H
 #define LINUX_MMC_HOST_H
 
+#include <linux/leds.h>
+
 #include <linux/mmc/core.h>
 
 struct mmc_ios {
@@ -51,6 +53,7 @@ struct mmc_host_ops {
         void    (*request)(struct mmc_host *host, struct mmc_request *req);
         void    (*set_ios)(struct mmc_host *host, struct mmc_ios *ios);
         int     (*get_ro)(struct mmc_host *host);
+        void    (*enable_sdio_irq)(struct mmc_host *host, int enable);
 };
 
 struct mmc_card;
@@ -87,9 +90,10 @@ struct mmc_host {
 
 #define MMC_CAP_4_BIT_DATA      (1 << 0)        /* Can the host do 4 bit transfers */
 #define MMC_CAP_MULTIWRITE      (1 << 1)        /* Can accurately report bytes sent to card on error */
-#define MMC_CAP_BYTEBLOCK       (1 << 2)        /* Can do non-log2 block sizes */
-#define MMC_CAP_MMC_HIGHSPEED   (1 << 3)        /* Can do MMC high-speed timing */
-#define MMC_CAP_SD_HIGHSPEED    (1 << 4)        /* Can do SD high-speed timing */
+#define MMC_CAP_MMC_HIGHSPEED   (1 << 2)        /* Can do MMC high-speed timing */
+#define MMC_CAP_SD_HIGHSPEED    (1 << 3)        /* Can do SD high-speed timing */
+#define MMC_CAP_SDIO_IRQ        (1 << 4)        /* Can signal pending SDIO IRQs */
+#define MMC_CAP_SPI             (1 << 5)        /* Talks only SPI protocols */
 
         /* host specific block data */
         unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
@@ -106,6 +110,14 @@ struct mmc_host {
         struct mmc_ios          ios;            /* current io bus settings */
         u32                     ocr;            /* the current OCR setting */
 
+        /* group bitfields together to minimize padding */
+        unsigned int            use_spi_crc:1;
+        unsigned int            claimed:1;      /* host exclusively claimed */
+        unsigned int            bus_dead:1;     /* bus has been released */
+#ifdef CONFIG_MMC_DEBUG
+        unsigned int            removed:1;      /* host is being removed */
+#endif
+
         unsigned int            mode;           /* current card mode of host */
 #define MMC_MODE_MMC            0
 #define MMC_MODE_SD             1
@@ -113,16 +125,19 @@ struct mmc_host {
         struct mmc_card         *card;          /* device attached to this host */
 
         wait_queue_head_t       wq;
-        unsigned int            claimed:1;      /* host exclusively claimed */
 
         struct delayed_work     detect;
-#ifdef CONFIG_MMC_DEBUG
-        unsigned int            removed:1;      /* host is being removed */
-#endif
 
         const struct mmc_bus_ops *bus_ops;      /* current bus driver */
         unsigned int            bus_refs;       /* reference counter */
-        unsigned int            bus_dead:1;     /* bus has been released */
+
+        unsigned int            sdio_irqs;
+        struct task_struct      *sdio_irq_thread;
+        atomic_t                sdio_irq_thread_abort;
+
+#ifdef CONFIG_LEDS_TRIGGERS
+        struct led_trigger      *led;           /* activity led */
+#endif
 
         unsigned long           private[0] ____cacheline_aligned;
 };
@@ -137,6 +152,8 @@ static inline void *mmc_priv(struct mmc_host *host)
         return (void *)host->private;
 }
 
+#define mmc_host_is_spi(host)   ((host)->caps & MMC_CAP_SPI)
+
 #define mmc_dev(x)      ((x)->parent)
 #define mmc_classdev(x) (&(x)->class_dev)
 #define mmc_hostname(x) ((x)->class_dev.bus_id)
@@ -147,5 +164,11 @@ extern int mmc_resume_host(struct mmc_host *);
 extern void mmc_detect_change(struct mmc_host *, unsigned long delay);
 extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
 
+static inline void mmc_signal_sdio_irq(struct mmc_host *host)
+{
+        host->ops->enable_sdio_irq(host, 0);
+        wake_up_process(host->sdio_irq_thread);
+}
+
 #endif
 
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index e3ed9b95040e..4236fbf0b6fb 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -27,7 +27,7 @@
 
 /* Standard MMC commands (4.1)           type  argument     response */
    /* class 1 */
-#define MMC_GO_IDLE_STATE         0   /* bc                          */
+#define MMC_GO_IDLE_STATE         0   /* bc                          */
 #define MMC_SEND_OP_COND          1   /* bcr  [31:0] OCR         R3  */
 #define MMC_ALL_SEND_CID          2   /* bcr                     R2  */
 #define MMC_SET_RELATIVE_ADDR     3   /* ac   [31:16] RCA        R1  */
@@ -39,8 +39,10 @@
 #define MMC_SEND_CID             10   /* ac   [31:16] RCA        R2  */
 #define MMC_READ_DAT_UNTIL_STOP  11   /* adtc [31:0] dadr        R1  */
 #define MMC_STOP_TRANSMISSION    12   /* ac                      R1b */
-#define MMC_SEND_STATUS          13   /* ac   [31:16] RCA        R1  */
+#define MMC_SEND_STATUS          13   /* ac   [31:16] RCA        R1  */
 #define MMC_GO_INACTIVE_STATE    15   /* ac   [31:16] RCA            */
+#define MMC_SPI_READ_OCR         58   /* spi                  spi_R3 */
+#define MMC_SPI_CRC_ON_OFF       59   /* spi  [0:0] flag      spi_R1 */
 
   /* class 2 */
 #define MMC_SET_BLOCKLEN         16   /* ac   [31:0] block len   R1  */
@@ -90,15 +92,15 @@
  */
 
 /*
-  MMC status in R1
+  MMC status in R1, for native mode (SPI bits are different)
   Type
-        e : error bit
+        e : error bit
         s : status bit
         r : detected and set for the actual command response
         x : detected and set during command execution. the host must poll
             the card by sending status command in order to read these bits.
   Clear condition
-        a : according to the card state
+        a : according to the card state
         b : always related to the previous command. Reception of
             a valid command will clear it (with a delay of one command)
         c : clear by read
@@ -124,10 +126,33 @@
 #define R1_CARD_ECC_DISABLED    (1 << 14)       /* sx, a */
 #define R1_ERASE_RESET          (1 << 13)       /* sr, c */
 #define R1_STATUS(x)            (x & 0xFFFFE000)
-#define R1_CURRENT_STATE(x)     ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
+#define R1_CURRENT_STATE(x)     ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
 #define R1_READY_FOR_DATA       (1 << 8)        /* sx, a */
 #define R1_APP_CMD              (1 << 5)        /* sr, c */
 
+/*
+ * MMC/SD in SPI mode reports R1 status always, and R2 for SEND_STATUS
+ * R1 is the low order byte; R2 is the next highest byte, when present.
+ */
+#define R1_SPI_IDLE             (1 << 0)
+#define R1_SPI_ERASE_RESET      (1 << 1)
+#define R1_SPI_ILLEGAL_COMMAND  (1 << 2)
+#define R1_SPI_COM_CRC          (1 << 3)
+#define R1_SPI_ERASE_SEQ        (1 << 4)
+#define R1_SPI_ADDRESS          (1 << 5)
+#define R1_SPI_PARAMETER        (1 << 6)
+/* R1 bit 7 is always zero */
+#define R2_SPI_CARD_LOCKED      (1 << 8)
+#define R2_SPI_WP_ERASE_SKIP    (1 << 9)        /* or lock/unlock fail */
+#define R2_SPI_LOCK_UNLOCK_FAIL R2_SPI_WP_ERASE_SKIP
+#define R2_SPI_ERROR            (1 << 10)
+#define R2_SPI_CC_ERROR         (1 << 11)
+#define R2_SPI_CARD_ECC_ERROR   (1 << 12)
+#define R2_SPI_WP_VIOLATION     (1 << 13)
+#define R2_SPI_ERASE_PARAM      (1 << 14)
+#define R2_SPI_OUT_OF_RANGE     (1 << 15)       /* or CSD overwrite */
+#define R2_SPI_CSD_OVERWRITE    R2_SPI_OUT_OF_RANGE
+
 /* These are unpacked versions of the actual responses */
 
 struct _mmc_csd {
@@ -182,6 +207,7 @@ struct _mmc_csd {
  */
 #define CCC_BASIC               (1<<0)  /* (0) Basic protocol functions */
                                         /* (CMD0,1,2,3,4,7,9,10,12,13,15) */
+                                        /* (and for SPI, CMD58,59) */
 #define CCC_STREAM_READ         (1<<1)  /* (1) Stream read commands */
                                         /* (CMD11) */
 #define CCC_BLOCK_READ          (1<<2)  /* (2) Block read commands */
@@ -227,6 +253,7 @@ struct _mmc_csd {
 #define EXT_CSD_BUS_WIDTH       183     /* R/W */
 #define EXT_CSD_HS_TIMING       185     /* R/W */
 #define EXT_CSD_CARD_TYPE       196     /* RO */
+#define EXT_CSD_REV             192     /* RO */
 #define EXT_CSD_SEC_CNT         212     /* RO, 4 bytes */
 
 /*
diff --git a/include/linux/mmc/sdio.h b/include/linux/mmc/sdio.h
new file mode 100644
index 000000000000..47ba464f5170
--- /dev/null
+++ b/include/linux/mmc/sdio.h
@@ -0,0 +1,159 @@
+/*
+ *  include/linux/mmc/sdio.h
+ *
+ *  Copyright 2006-2007 Pierre Ossman
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#ifndef MMC_SDIO_H
+#define MMC_SDIO_H
+
+/* SDIO commands                         type  argument     response */
+#define SD_IO_SEND_OP_COND          5 /* bcr  [23:0] OCR         R4  */
+#define SD_IO_RW_DIRECT            52 /* ac   [31:0] See below   R5  */
+#define SD_IO_RW_EXTENDED          53 /* adtc [31:0] See below   R5  */
+
+/*
+ * SD_IO_RW_DIRECT argument format:
+ *
+ *      [31] R/W flag
+ *      [30:28] Function number
+ *      [27] RAW flag
+ *      [25:9] Register address
+ *      [7:0] Data
+ */
+
+/*
+ * SD_IO_RW_EXTENDED argument format:
+ *
+ *      [31] R/W flag
+ *      [30:28] Function number
+ *      [27] Block mode
+ *      [26] Increment address
+ *      [25:9] Register address
+ *      [8:0] Byte/block count
+ */
+
+/*
+  SDIO status in R5
+  Type
+        e : error bit
+        s : status bit
+        r : detected and set for the actual command response
+        x : detected and set during command execution. the host must poll
+            the card by sending status command in order to read these bits.
+  Clear condition
+        a : according to the card state
+        b : always related to the previous command. Reception of
+            a valid command will clear it (with a delay of one command)
+        c : clear by read
+ */
+
+#define R5_COM_CRC_ERROR        (1 << 15)       /* er, b */
+#define R5_ILLEGAL_COMMAND      (1 << 14)       /* er, b */
+#define R5_ERROR                (1 << 11)       /* erx, c */
+#define R5_FUNCTION_NUMBER      (1 << 9)        /* er, c */
+#define R5_OUT_OF_RANGE         (1 << 8)        /* er, c */
+#define R5_STATUS(x)            (x & 0xCB00)
+#define R5_IO_CURRENT_STATE(x)  ((x & 0x3000) >> 12) /* s, b */
+
+/*
+ * Card Common Control Registers (CCCR)
+ */
+
+#define SDIO_CCCR_CCCR          0x00
+
+#define  SDIO_CCCR_REV_1_00     0       /* CCCR/FBR Version 1.00 */
+#define  SDIO_CCCR_REV_1_10     1       /* CCCR/FBR Version 1.10 */
+#define  SDIO_CCCR_REV_1_20     2       /* CCCR/FBR Version 1.20 */
+
+#define  SDIO_SDIO_REV_1_00     0       /* SDIO Spec Version 1.00 */
+#define  SDIO_SDIO_REV_1_10     1       /* SDIO Spec Version 1.10 */
+#define  SDIO_SDIO_REV_1_20     2       /* SDIO Spec Version 1.20 */
+#define  SDIO_SDIO_REV_2_00     3       /* SDIO Spec Version 2.00 */
+
+#define SDIO_CCCR_SD            0x01
+
+#define  SDIO_SD_REV_1_01       0       /* SD Physical Spec Version 1.01 */
+#define  SDIO_SD_REV_1_10       1       /* SD Physical Spec Version 1.10 */
+#define  SDIO_SD_REV_2_00       2       /* SD Physical Spec Version 2.00 */
+
+#define SDIO_CCCR_IOEx          0x02
+#define SDIO_CCCR_IORx          0x03
+
+#define SDIO_CCCR_IENx          0x04    /* Function/Master Interrupt Enable */
+#define SDIO_CCCR_INTx          0x05    /* Function Interrupt Pending */
+
+#define SDIO_CCCR_ABORT         0x06    /* function abort/card reset */
+
+#define SDIO_CCCR_IF            0x07    /* bus interface controls */
+
+#define  SDIO_BUS_WIDTH_1BIT    0x00
+#define  SDIO_BUS_WIDTH_4BIT    0x02
+
+#define  SDIO_BUS_CD_DISABLE     0x80   /* disable pull-up on DAT3 (pin 1) */
+
+#define SDIO_CCCR_CAPS          0x08
+
+#define  SDIO_CCCR_CAP_SDC      0x01    /* can do CMD52 while data transfer */
+#define  SDIO_CCCR_CAP_SMB      0x02    /* can do multi-block xfers (CMD53) */
+#define  SDIO_CCCR_CAP_SRW      0x04    /* supports read-wait protocol */
+#define  SDIO_CCCR_CAP_SBS      0x08    /* supports suspend/resume */
+#define  SDIO_CCCR_CAP_S4MI     0x10    /* interrupt during 4-bit CMD53 */
+#define  SDIO_CCCR_CAP_E4MI     0x20    /* enable ints during 4-bit CMD53 */
+#define  SDIO_CCCR_CAP_LSC      0x40    /* low speed card */
+#define  SDIO_CCCR_CAP_4BLS     0x80    /* 4 bit low speed card */
+
+#define SDIO_CCCR_CIS           0x09    /* common CIS pointer (3 bytes) */
+
+/* Following 4 regs are valid only if SBS is set */
+#define SDIO_CCCR_SUSPEND       0x0c
+#define SDIO_CCCR_SELx          0x0d
+#define SDIO_CCCR_EXECx         0x0e
+#define SDIO_CCCR_READYx        0x0f
+
+#define SDIO_CCCR_BLKSIZE       0x10
+
+#define SDIO_CCCR_POWER         0x12
+
+#define  SDIO_POWER_SMPC        0x01    /* Supports Master Power Control */
+#define  SDIO_POWER_EMPC        0x02    /* Enable Master Power Control */
+
+#define SDIO_CCCR_SPEED         0x13
+
+#define  SDIO_SPEED_SHS         0x01    /* Supports High-Speed mode */
+#define  SDIO_SPEED_EHS         0x02    /* Enable High-Speed mode */
+
+/*
+ * Function Basic Registers (FBR)
+ */
+
+#define SDIO_FBR_BASE(f)        ((f) * 0x100) /* base of function f's FBRs */
+
+#define SDIO_FBR_STD_IF         0x00
+
+#define  SDIO_FBR_SUPPORTS_CSA  0x40    /* supports Code Storage Area */
+#define  SDIO_FBR_ENABLE_CSA    0x80    /* enable Code Storage Area */
+
+#define SDIO_FBR_STD_IF_EXT     0x01
+
+#define SDIO_FBR_POWER          0x02
+
+#define  SDIO_FBR_POWER_SPS     0x01    /* Supports Power Selection */
+#define  SDIO_FBR_POWER_EPS     0x02    /* Enable (low) Power Selection */
+
+#define SDIO_FBR_CIS            0x09    /* CIS pointer (3 bytes) */
+
+
+#define SDIO_FBR_CSA            0x0C    /* CSA pointer (3 bytes) */
+
+#define SDIO_FBR_CSA_DATA       0x0F
+
+#define SDIO_FBR_BLKSIZE        0x10    /* block size (2 bytes) */
+
+#endif
+
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
new file mode 100644
index 000000000000..b050f4d7b41f
--- /dev/null
+++ b/include/linux/mmc/sdio_func.h
@@ -0,0 +1,153 @@
+/*
+ *  include/linux/mmc/sdio_func.h
+ *
+ *  Copyright 2007 Pierre Ossman
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#ifndef MMC_SDIO_FUNC_H
+#define MMC_SDIO_FUNC_H
+
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+
+struct mmc_card;
+struct sdio_func;
+
+typedef void (sdio_irq_handler_t)(struct sdio_func *);
+
+/*
+ * SDIO function CIS tuple (unknown to the core)
+ */
+struct sdio_func_tuple {
+        struct sdio_func_tuple *next;
+        unsigned char code;
+        unsigned char size;
+        unsigned char data[0];
+};
+
+/*
+ * SDIO function devices
+ */
+struct sdio_func {
+        struct mmc_card         *card;          /* the card this device belongs to */
+        struct device           dev;            /* the device */
+        sdio_irq_handler_t      *irq_handler;   /* IRQ callback */
+        unsigned int            num;            /* function number */
+
+        unsigned char           class;          /* standard interface class */
+        unsigned short          vendor;         /* vendor id */
+        unsigned short          device;         /* device id */
+
+        unsigned                max_blksize;    /* maximum block size */
+        unsigned                cur_blksize;    /* current block size */
+
+        unsigned int            state;          /* function state */
+#define SDIO_STATE_PRESENT      (1<<0)          /* present in sysfs */
+
+        u8                      tmpbuf[4];      /* DMA:able scratch buffer */
+
+        unsigned                num_info;       /* number of info strings */
+        const char              **info;         /* info strings */
+
+        struct sdio_func_tuple *tuples;
+};
+
+#define sdio_func_present(f)    ((f)->state & SDIO_STATE_PRESENT)
+
+#define sdio_func_set_present(f) ((f)->state |= SDIO_STATE_PRESENT)
+
+#define sdio_func_id(f)         ((f)->dev.bus_id)
+
+#define sdio_get_drvdata(f)     dev_get_drvdata(&(f)->dev)
+#define sdio_set_drvdata(f,d)   dev_set_drvdata(&(f)->dev, d)
+
+/*
+ * SDIO function device driver
+ */
+struct sdio_driver {
+        char *name;
+        const struct sdio_device_id *id_table;
+
+        int (*probe)(struct sdio_func *, const struct sdio_device_id *);
+        void (*remove)(struct sdio_func *);
+
+        struct device_driver drv;
+};
+
+/**
+ * SDIO_DEVICE - macro used to describe a specific SDIO device
+ * @vend: the 16 bit manufacturer code
+ * @dev: the 16 bit function id
+ *
+ * This macro is used to create a struct sdio_device_id that matches a
+ * specific device. The class field will be set to SDIO_ANY_ID.
+ */
+#define SDIO_DEVICE(vend,dev) \
+        .class = SDIO_ANY_ID, \
+        .vendor = (vend), .device = (dev)
+
+/**
+ * SDIO_DEVICE_CLASS - macro used to describe a specific SDIO device class
+ * @dev_class: the 8 bit standard interface code
+ *
+ * This macro is used to create a struct sdio_device_id that matches a
+ * specific standard SDIO function type.  The vendor and device fields will
+ * be set to SDIO_ANY_ID.
+ */
+#define SDIO_DEVICE_CLASS(dev_class) \
+        .class = (dev_class), \
+        .vendor = SDIO_ANY_ID, .device = SDIO_ANY_ID
+
+extern int sdio_register_driver(struct sdio_driver *);
+extern void sdio_unregister_driver(struct sdio_driver *);
+
+/*
+ * SDIO I/O operations
+ */
+extern void sdio_claim_host(struct sdio_func *func);
+extern void sdio_release_host(struct sdio_func *func);
+
+extern int sdio_enable_func(struct sdio_func *func);
+extern int sdio_disable_func(struct sdio_func *func);
+
+extern int sdio_set_block_size(struct sdio_func *func, unsigned blksz);
+
+extern int sdio_claim_irq(struct sdio_func *func, sdio_irq_handler_t *handler);
+extern int sdio_release_irq(struct sdio_func *func);
+
+extern unsigned char sdio_readb(struct sdio_func *func,
+        unsigned int addr, int *err_ret);
+extern unsigned short sdio_readw(struct sdio_func *func,
+        unsigned int addr, int *err_ret);
+extern unsigned long sdio_readl(struct sdio_func *func,
+        unsigned int addr, int *err_ret);
+
+extern int sdio_memcpy_fromio(struct sdio_func *func, void *dst,
+        unsigned int addr, int count);
+extern int sdio_readsb(struct sdio_func *func, void *dst,
+        unsigned int addr, int count);
+
+extern void sdio_writeb(struct sdio_func *func, unsigned char b,
+        unsigned int addr, int *err_ret);
+extern void sdio_writew(struct sdio_func *func, unsigned short b,
+        unsigned int addr, int *err_ret);
+extern void sdio_writel(struct sdio_func *func, unsigned long b,
+        unsigned int addr, int *err_ret);
+
+extern int sdio_memcpy_toio(struct sdio_func *func, unsigned int addr,
+        void *src, int count);
+extern int sdio_writesb(struct sdio_func *func, unsigned int addr,
+        void *src, int count);
+
+extern unsigned char sdio_f0_readb(struct sdio_func *func,
+        unsigned int addr, int *err_ret);
+extern void sdio_f0_writeb(struct sdio_func *func, unsigned char b,
+        unsigned int addr, int *err_ret);
+
+#endif
+
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
new file mode 100644
index 000000000000..09306d47ff5e
--- /dev/null
+++ b/include/linux/mmc/sdio_ids.h
@@ -0,0 +1,23 @@
+/*
+ * SDIO Classes, Interface Types, Manufacturer IDs, etc.
+ */
+
+#ifndef MMC_SDIO_IDS_H
+#define MMC_SDIO_IDS_H
+
+/*
+ * Standard SDIO Function Interfaces
+ */
+
+#define SDIO_CLASS_NONE         0x00    /* Not a SDIO standard interface */
+#define SDIO_CLASS_UART         0x01    /* standard UART interface */
+#define SDIO_CLASS_BT_A         0x02    /* Type-A BlueTooth std interface */
+#define SDIO_CLASS_BT_B         0x03    /* Type-B BlueTooth std interface */
+#define SDIO_CLASS_GPS          0x04    /* GPS standard interface */
+#define SDIO_CLASS_CAMERA       0x05    /* Camera standard interface */
+#define SDIO_CLASS_PHS          0x06    /* PHS standard interface */
+#define SDIO_CLASS_WLAN         0x07    /* WLAN interface */
+#define SDIO_CLASS_ATA          0x08    /* Embedded SDIO-ATA std interface */
+
+
+#endif