Patched in Tegra support.

14 files changed, 210 insertions, 467 deletions

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 5c69315d60c..9178aa48209 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -10,7 +10,6 @@
 #ifndef LINUX_MMC_CARD_H
 #define LINUX_MMC_CARD_H
 
-#include <linux/device.h>
 #include <linux/mmc/core.h>
 #include <linux/mod_devicetable.h>
 
@@ -51,18 +50,9 @@ struct mmc_ext_csd {
         u8                      rel_sectors;
         u8                      rel_param;
         u8                      part_config;
-        u8                      cache_ctrl;
-        u8                      rst_n_function;
         unsigned int            part_time;              /* Units: ms */
         unsigned int            sa_timeout;             /* Units: 100ns */
-        unsigned int            generic_cmd6_time;      /* Units: 10ms */
-        unsigned int            power_off_longtime;     /* Units: ms */
-        u8                      power_off_notification; /* state */
         unsigned int            hs_max_dtr;
-#define MMC_HIGH_26_MAX_DTR     26000000
-#define MMC_HIGH_52_MAX_DTR     52000000
-#define MMC_HIGH_DDR_MAX_DTR    52000000
-#define MMC_HS200_MAX_DTR       200000000
         unsigned int            sectors;
         unsigned int            card_type;
         unsigned int            hc_erase_size;          /* In sectors */
@@ -73,23 +63,11 @@ struct mmc_ext_csd {
         bool                    enhanced_area_en;       /* enable bit */
         unsigned long long      enhanced_area_offset;   /* Units: Byte */
         unsigned int            enhanced_area_size;     /* Units: KB */
-        unsigned int            cache_size;             /* Units: KB */
-        bool                    hpi_en;                 /* HPI enablebit */
-        bool                    hpi;                    /* HPI support bit */
-        unsigned int            hpi_cmd;                /* cmd used as HPI */
-        bool                    bkops;          /* background support bit */
-        bool                    bkops_en;       /* background enable bit */
-        unsigned int            data_sector_size;       /* 512 bytes or 4KB */
-        unsigned int            data_tag_unit_size;     /* DATA TAG UNIT size */
-        unsigned int            boot_ro_lock;           /* ro lock support */
-        bool                    boot_ro_lockable;
-        u8                      raw_exception_status;   /* 53 */
+        unsigned int            boot_size;              /* in bytes */
         u8                      raw_partition_support;  /* 160 */
-        u8                      raw_rpmb_size_mult;     /* 168 */
         u8                      raw_erased_mem_count;   /* 181 */
         u8                      raw_ext_csd_structure;  /* 194 */
         u8                      raw_card_type;          /* 196 */
-        u8                      out_of_int_time;        /* 198 */
         u8                      raw_s_a_timeout;                /* 217 */
         u8                      raw_hc_erase_gap_size;  /* 221 */
         u8                      raw_erase_timeout_mult; /* 223 */
@@ -98,11 +76,13 @@ struct mmc_ext_csd {
         u8                      raw_sec_erase_mult;     /* 230 */
         u8                      raw_sec_feature_support;/* 231 */
         u8                      raw_trim_mult;          /* 232 */
-        u8                      raw_bkops_status;       /* 246 */
         u8                      raw_sectors[4];         /* 212 - 4 bytes */
-
-        unsigned int            feature_support;
-#define MMC_DISCARD_FEATURE     BIT(0)                  /* CMD38 feature */
+        bool                    hpi_en;                 /* HPI enablebit */
+        bool                    hpi;                    /* HPI support bit */
+        unsigned int            hpi_cmd;                /* cmd used as HPI */
+        u8                      out_of_int_time;        /* out of int time */
+        bool                    bk_ops;                 /* BK ops support bit */
+        bool                    bk_ops_en;              /* BK ops enable bit */
 };
 
 struct sd_scr {
@@ -125,7 +105,6 @@ struct sd_ssr {
 struct sd_switch_caps {
         unsigned int            hs_max_dtr;
         unsigned int            uhs_max_dtr;
-#define HIGH_SPEED_MAX_DTR      50000000
 #define UHS_SDR104_MAX_DTR      208000000
 #define UHS_SDR50_MAX_DTR       100000000
 #define UHS_DDR50_MAX_DTR       50000000
@@ -133,13 +112,11 @@ struct sd_switch_caps {
 #define UHS_SDR12_MAX_DTR       25000000
         unsigned int            sd3_bus_mode;
 #define UHS_SDR12_BUS_SPEED     0
-#define HIGH_SPEED_BUS_SPEED    1
 #define UHS_SDR25_BUS_SPEED     1
 #define UHS_SDR50_BUS_SPEED     2
 #define UHS_SDR104_BUS_SPEED    3
 #define UHS_DDR50_BUS_SPEED     4
 
-#define SD_MODE_HIGH_SPEED      (1 << HIGH_SPEED_BUS_SPEED)
 #define SD_MODE_UHS_SDR12       (1 << UHS_SDR12_BUS_SPEED)
 #define SD_MODE_UHS_SDR25       (1 << UHS_SDR25_BUS_SPEED)
 #define SD_MODE_UHS_SDR50       (1 << UHS_SDR50_BUS_SPEED)
@@ -155,7 +132,6 @@ struct sd_switch_caps {
 #define SD_SET_CURRENT_LIMIT_400        1
 #define SD_SET_CURRENT_LIMIT_600        2
 #define SD_SET_CURRENT_LIMIT_800        3
-#define SD_SET_CURRENT_NO_CHANGE        (-1)
 
 #define SD_MAX_CURRENT_200      (1 << SD_SET_CURRENT_LIMIT_200)
 #define SD_MAX_CURRENT_400      (1 << SD_SET_CURRENT_LIMIT_400)
@@ -187,29 +163,6 @@ struct sdio_func_tuple;
 
 #define SDIO_MAX_FUNCS          7
 
-/* The number of MMC physical partitions.  These consist of:
- * boot partitions (2), general purpose partitions (4) in MMC v4.4.
- */
-#define MMC_NUM_BOOT_PARTITION  2
-#define MMC_NUM_GP_PARTITION    4
-#define MMC_NUM_PHY_PARTITION   6
-#define MAX_MMC_PART_NAME_LEN   20
-
-/*
- * MMC Physical partitions
- */
-struct mmc_part {
-        unsigned int    size;   /* partition size (in bytes) */
-        unsigned int    part_cfg;       /* partition type */
-        char    name[MAX_MMC_PART_NAME_LEN];
-        bool    force_ro;       /* to make boot parts RO by default */
-        unsigned int    area_type;
-#define MMC_BLK_DATA_AREA_MAIN  (1<<0)
-#define MMC_BLK_DATA_AREA_BOOT  (1<<1)
-#define MMC_BLK_DATA_AREA_GP    (1<<2)
-#define MMC_BLK_DATA_AREA_RPMB  (1<<3)
-};
-
 /*
  * MMC device
  */
@@ -229,10 +182,9 @@ struct mmc_card {
 #define MMC_STATE_BLOCKADDR     (1<<3)          /* card uses block-addressing */
 #define MMC_STATE_HIGHSPEED_DDR (1<<4)          /* card is in high speed mode */
 #define MMC_STATE_ULTRAHIGHSPEED (1<<5)         /* card is in ultra high speed mode */
+#define MMC_STATE_DOING_BKOPS   (1<<6)          /* Card doing bkops */
+#define MMC_STATE_NEED_BKOPS    (1<<7)          /* Card needs to do bkops */
 #define MMC_CARD_SDXC           (1<<6)          /* card is SDXC */
-#define MMC_CARD_REMOVED        (1<<7)          /* card has been removed */
-#define MMC_STATE_HIGHSPEED_200 (1<<8)          /* card is in HS200 mode */
-#define MMC_STATE_DOING_BKOPS   (1<<10)         /* card is doing BKOPS */
         unsigned int            quirks;         /* card quirks */
 #define MMC_QUIRK_LENIENT_FN0   (1<<0)          /* allow SDIO FN0 writes outside of the VS CCCR range */
 #define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1)    /* use func->cur_blksize */
@@ -244,10 +196,6 @@ struct mmc_card {
 #define MMC_QUIRK_DISABLE_CD    (1<<5)          /* disconnect CD/DAT[3] resistor */
 #define MMC_QUIRK_INAND_CMD38   (1<<6)          /* iNAND devices have broken CMD38 */
 #define MMC_QUIRK_BLK_NO_CMD23  (1<<7)          /* Avoid CMD23 for regular multiblock */
-#define MMC_QUIRK_BROKEN_BYTE_MODE_512 (1<<8)   /* Avoid sending 512 bytes in */
-#define MMC_QUIRK_LONG_READ_TIME (1<<9)         /* Data read time > CSD says */
-#define MMC_QUIRK_SEC_ERASE_TRIM_BROKEN (1<<10) /* Skip secure for erase/trim */
-                                                /* byte mode */
 
         unsigned int            erase_size;     /* erase size in sectors */
         unsigned int            erase_shift;    /* if erase unit is power 2 */
@@ -276,26 +224,9 @@ struct mmc_card {
         unsigned int            sd_bus_speed;   /* Bus Speed Mode set for the card */
 
         struct dentry           *debugfs_root;
-        struct mmc_part part[MMC_NUM_PHY_PARTITION]; /* physical partitions */
-        unsigned int    nr_parts;
 };
 
 /*
- * This function fill contents in mmc_part.
- */
-static inline void mmc_part_add(struct mmc_card *card, unsigned int size,
-                        unsigned int part_cfg, char *name, int idx, bool ro,
-                        int area_type)
-{
-        card->part[card->nr_parts].size = size;
-        card->part[card->nr_parts].part_cfg = part_cfg;
-        sprintf(card->part[card->nr_parts].name, name, idx);
-        card->part[card->nr_parts].force_ro = ro;
-        card->part[card->nr_parts].area_type = area_type;
-        card->nr_parts++;
-}
-
-/*
  *  The world is not perfect and supplies us with broken mmc/sdio devices.
  *  For at least some of these bugs we need a work-around.
  */
@@ -387,27 +318,19 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
 #define mmc_card_present(c)     ((c)->state & MMC_STATE_PRESENT)
 #define mmc_card_readonly(c)    ((c)->state & MMC_STATE_READONLY)
 #define mmc_card_highspeed(c)   ((c)->state & MMC_STATE_HIGHSPEED)
-#define mmc_card_hs200(c)       ((c)->state & MMC_STATE_HIGHSPEED_200)
 #define mmc_card_blockaddr(c)   ((c)->state & MMC_STATE_BLOCKADDR)
 #define mmc_card_ddr_mode(c)    ((c)->state & MMC_STATE_HIGHSPEED_DDR)
-#define mmc_card_uhs(c)         ((c)->state & MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_sd_card_uhs(c)      ((c)->state & MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_card_ext_capacity(c) ((c)->state & MMC_CARD_SDXC)
-#define mmc_card_removed(c)     ((c) && ((c)->state & MMC_CARD_REMOVED))
-#define mmc_card_doing_bkops(c) ((c)->state & MMC_STATE_DOING_BKOPS)
-
+#define mmc_card_doing_bkops(c) ((c)->state & MMC_STATE_DOING_BKOPS)
+#define mmc_card_need_bkops(c) ((c)->state & MMC_STATE_NEED_BKOPS)
 #define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
 #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
 #define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED)
-#define mmc_card_set_hs200(c)   ((c)->state |= MMC_STATE_HIGHSPEED_200)
 #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)
 #define mmc_card_set_ddr_mode(c) ((c)->state |= MMC_STATE_HIGHSPEED_DDR)
-#define mmc_card_set_uhs(c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_sd_card_set_uhs(c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_card_set_ext_capacity(c) ((c)->state |= MMC_CARD_SDXC)
-#define mmc_card_set_removed(c) ((c)->state |= MMC_CARD_REMOVED)
-#define mmc_card_set_doing_bkops(c)     ((c)->state |= MMC_STATE_DOING_BKOPS)
-#define mmc_card_clr_doing_bkops(c)     ((c)->state &= ~MMC_STATE_DOING_BKOPS)
 
 /*
  * Quirk add/remove for MMC products.
@@ -442,6 +365,11 @@ static inline void __maybe_unused remove_quirk_sd(struct mmc_card *card,
         if (mmc_card_sd(card))
                 card->quirks &= ~data;
 }
+#define mmc_card_set_doing_bkops(c) ((c)->state |= MMC_STATE_DOING_BKOPS)
+#define mmc_card_set_need_bkops(c) ((c)->state |= MMC_STATE_NEED_BKOPS)
+
+#define mmc_card_clr_doing_bkops(c) ((c)->state &= ~MMC_STATE_DOING_BKOPS)
+#define mmc_card_clr_need_bkops(c) ((c)->state &= ~MMC_STATE_NEED_BKOPS)
 
 static inline int mmc_card_lenient_fn0(const struct mmc_card *c)
 {
@@ -463,16 +391,6 @@ static inline int mmc_card_nonstd_func_interface(const struct mmc_card *c)
         return c->quirks & MMC_QUIRK_NONSTD_FUNC_IF;
 }
 
-static inline int mmc_card_broken_byte_mode_512(const struct mmc_card *c)
-{
-        return c->quirks & MMC_QUIRK_BROKEN_BYTE_MODE_512;
-}
-
-static inline int mmc_card_long_read_time(const struct mmc_card *c)
-{
-        return c->quirks & MMC_QUIRK_LONG_READ_TIME;
-}
-
 #define mmc_card_name(c)        ((c)->cid.prod_name)
 #define mmc_card_id(c)          (dev_name(&(c)->dev))
 
@@ -489,7 +407,7 @@ struct mmc_driver {
         struct device_driver drv;
         int (*probe)(struct mmc_card *);
         void (*remove)(struct mmc_card *);
-        int (*suspend)(struct mmc_card *);
+        int (*suspend)(struct mmc_card *, pm_message_t);
         int (*resume)(struct mmc_card *);
 };
 
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 5bf7c2274fc..c3e55fa63fb 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -9,7 +9,7 @@
 #define LINUX_MMC_CORE_H
 
 #include <linux/interrupt.h>
-#include <linux/completion.h>
+#include <linux/device.h>
 
 struct request;
 struct mmc_data;
@@ -134,24 +134,21 @@ struct mmc_host;
 struct mmc_card;
 struct mmc_async_req;
 
-extern int mmc_stop_bkops(struct mmc_card *);
-extern int mmc_read_bkops_status(struct mmc_card *);
 extern struct mmc_async_req *mmc_start_req(struct mmc_host *,
                                            struct mmc_async_req *, int *);
 extern int mmc_interrupt_hpi(struct mmc_card *);
+extern int mmc_bkops_start(struct mmc_card *card, bool is_synchronous);
+
 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_app_cmd(struct mmc_host *, struct mmc_card *);
 extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
         struct mmc_command *, int);
-extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);
-extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool);
 extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);
 
 #define MMC_ERASE_ARG           0x00000000
 #define MMC_SECURE_ERASE_ARG    0x80000000
 #define MMC_TRIM_ARG            0x00000001
-#define MMC_DISCARD_ARG         0x00000003
 #define MMC_SECURE_TRIM1_ARG    0x80000001
 #define MMC_SECURE_TRIM2_ARG    0x80008000
 
@@ -162,31 +159,21 @@ extern int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
                      unsigned int arg);
 extern int mmc_can_erase(struct mmc_card *card);
 extern int mmc_can_trim(struct mmc_card *card);
-extern int mmc_can_discard(struct mmc_card *card);
-extern int mmc_can_sanitize(struct mmc_card *card);
 extern int mmc_can_secure_erase_trim(struct mmc_card *card);
 extern int mmc_erase_group_aligned(struct mmc_card *card, unsigned int from,
                                    unsigned int nr);
 extern unsigned int mmc_calc_max_discard(struct mmc_card *card);
 
 extern int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen);
-extern int mmc_set_blockcount(struct mmc_card *card, unsigned int blockcount,
-                              bool is_rel_write);
-extern int mmc_hw_reset(struct mmc_host *host);
-extern int mmc_hw_reset_check(struct mmc_host *host);
-extern int mmc_can_reset(struct mmc_card *card);
 
 extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *);
 extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
 
 extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);
+extern void mmc_do_release_host(struct mmc_host *host);
 extern int mmc_try_claim_host(struct mmc_host *host);
 
-extern int mmc_flush_cache(struct mmc_card *);
-
-extern int mmc_detect_card_removed(struct mmc_host *host);
-
 /**
  *      mmc_claim_host - exclusively claim a host
  *      @host: mmc host to claim
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 34be4f47293..6b46819705d 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -14,8 +14,6 @@
 #ifndef LINUX_MMC_DW_MMC_H
 #define LINUX_MMC_DW_MMC_H
 
-#include <linux/scatterlist.h>
-
 #define MAX_MCI_SLOTS   2
 
 enum dw_mci_state {
@@ -42,7 +40,7 @@ struct mmc_data;
  * @lock: Spinlock protecting the queue and associated data.
  * @regs: Pointer to MMIO registers.
  * @sg: Scatterlist entry currently being processed by PIO code, if any.
- * @sg_miter: PIO mapping scatterlist iterator.
+ * @pio_offset: Offset into the current scatterlist entry.
  * @cur_slot: The slot which is currently using the controller.
  * @mrq: The request currently being processed on @cur_slot,
  *      or NULL if the controller is idle.
@@ -74,14 +72,8 @@ struct mmc_data;
  *      rate and timeout calculations.
  * @current_speed: Configured rate of the controller.
  * @num_slots: Number of slots available.
- * @verid: Denote Version ID.
- * @data_offset: Set the offset of DATA register according to VERID.
- * @dev: Device associated with the MMC controller.
+ * @pdev: Platform device associated with the MMC controller.
  * @pdata: Platform data associated with the MMC controller.
- * @drv_data: Driver specific data for identified variant of the controller
- * @priv: Implementation defined private data.
- * @biu_clk: Pointer to bus interface unit clock instance.
- * @ciu_clk: Pointer to card interface unit clock instance.
  * @slot: Slots sharing this MMC controller.
  * @fifo_depth: depth of FIFO.
  * @data_shift: log2 of FIFO item size.
@@ -91,8 +83,6 @@ struct mmc_data;
  * @push_data: Pointer to FIFO push function.
  * @pull_data: Pointer to FIFO pull function.
  * @quirks: Set of quirks that apply to specific versions of the IP.
- * @irq_flags: The flags to be passed to request_irq.
- * @irq: The irq value to be passed to request_irq.
  *
  * Locking
  * =======
@@ -123,13 +113,12 @@ struct dw_mci {
         void __iomem            *regs;
 
         struct scatterlist      *sg;
-        struct sg_mapping_iter  sg_miter;
+        unsigned int            pio_offset;
 
         struct dw_mci_slot      *cur_slot;
         struct mmc_request      *mrq;
         struct mmc_command      *cmd;
         struct mmc_data         *data;
-        struct workqueue_struct *card_workqueue;
 
         /* DMA interface members*/
         int                     use_dma;
@@ -137,7 +126,7 @@ struct dw_mci {
 
         dma_addr_t              sg_dma;
         void                    *sg_cpu;
-        const struct dw_mci_dma_ops     *dma_ops;
+        struct dw_mci_dma_ops   *dma_ops;
 #ifdef CONFIG_MMC_DW_IDMAC
         unsigned int            ring_size;
 #else
@@ -158,14 +147,8 @@ struct dw_mci {
         u32                     current_speed;
         u32                     num_slots;
         u32                     fifoth_val;
-        u16                     verid;
-        u16                     data_offset;
-        struct device           *dev;
+        struct platform_device  *pdev;
         struct dw_mci_board     *pdata;
-        const struct dw_mci_drv_data    *drv_data;
-        void                    *priv;
-        struct clk              *biu_clk;
-        struct clk              *ciu_clk;
         struct dw_mci_slot      *slot[MAX_MCI_SLOTS];
 
         /* FIFO push and pull */
@@ -185,8 +168,6 @@ struct dw_mci {
         u32                     quirks;
 
         struct regulator        *vmmc;  /* Power regulator */
-        unsigned long           irq_flags; /* IRQ flags */
-        int                     irq;
 };
 
 /* DMA ops for Internal/External DMAC interface */
@@ -209,8 +190,7 @@ struct dw_mci_dma_ops {
 #define DW_MCI_QUIRK_HIGHSPEED                  BIT(2)
 /* Unreliable card detection */
 #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION      BIT(3)
-/* Write Protect detection not available */
-#define DW_MCI_QUIRK_NO_WRITE_PROTECT           BIT(4)
+
 
 struct dma_pdata;
 
@@ -227,11 +207,9 @@ struct dw_mci_board {
         u32 num_slots;
 
         u32 quirks; /* Workaround / Quirk flags */
-        unsigned int bus_hz; /* Clock speed at the cclk_in pad */
+        unsigned int bus_hz; /* Bus speed */
 
-        u32 caps;       /* Capabilities */
-        u32 caps2;      /* More capabilities */
-        u32 pm_caps;    /* PM capabilities */
+        unsigned int caps;      /* Capabilities */
         /*
          * Override fifo depth. If 0, autodetect it from the FIFOTH register,
          * but note that this may not be reliable after a bootloader has used
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 61a10c17aab..8c0bf3f2a36 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -11,10 +11,8 @@
 #define LINUX_MMC_HOST_H
 
 #include <linux/leds.h>
-#include <linux/mutex.h>
 #include <linux/sched.h>
-#include <linux/device.h>
-#include <linux/fault-inject.h>
+#include <linux/wakelock.h>
 
 #include <linux/mmc/core.h>
 #include <linux/mmc/pm.h>
@@ -53,18 +51,15 @@ struct mmc_ios {
 #define MMC_TIMING_LEGACY       0
 #define MMC_TIMING_MMC_HS       1
 #define MMC_TIMING_SD_HS        2
-#define MMC_TIMING_UHS_SDR12    3
-#define MMC_TIMING_UHS_SDR25    4
-#define MMC_TIMING_UHS_SDR50    5
-#define MMC_TIMING_UHS_SDR104   6
-#define MMC_TIMING_UHS_DDR50    7
-#define MMC_TIMING_MMC_HS200    8
+#define MMC_TIMING_UHS_SDR12    MMC_TIMING_LEGACY
+#define MMC_TIMING_UHS_SDR25    MMC_TIMING_SD_HS
+#define MMC_TIMING_UHS_SDR50    3
+#define MMC_TIMING_UHS_SDR104   4
+#define MMC_TIMING_UHS_DDR50    5
 
 #define MMC_SDR_MODE            0
 #define MMC_1_2V_DDR_MODE       1
 #define MMC_1_8V_DDR_MODE       2
-#define MMC_1_2V_SDR_MODE       3
-#define MMC_1_8V_SDR_MODE       4
 
         unsigned char   signal_voltage;         /* signalling voltage (1.8V or 3.3V) */
 
@@ -82,18 +77,38 @@ struct mmc_ios {
 
 struct mmc_host_ops {
         /*
-         * 'enable' is called when the host is claimed and 'disable' is called
-         * when the host is released. 'enable' and 'disable' are deprecated.
+         * Hosts that support power saving can use the 'enable' and 'disable'
+         * methods to exit and enter power saving states. 'enable' is called
+         * when the host is claimed and 'disable' is called (or scheduled with
+         * a delay) when the host is released. The 'disable' is scheduled if
+         * the disable delay set by 'mmc_set_disable_delay()' is non-zero,
+         * otherwise 'disable' is called immediately. 'disable' may be
+         * scheduled repeatedly, to permit ever greater power saving at the
+         * expense of ever greater latency to re-enable. Rescheduling is
+         * determined by the return value of the 'disable' method. A positive
+         * value gives the delay in milliseconds.
+         *
+         * In the case where a host function (like set_ios) may be called
+         * with or without the host claimed, enabling and disabling can be
+         * done directly and will nest correctly. Call 'mmc_host_enable()' and
+         * 'mmc_host_lazy_disable()' for this purpose, but note that these
+         * functions must be paired.
+         *
+         * Alternatively, 'mmc_host_enable()' may be paired with
+         * 'mmc_host_disable()' which calls 'disable' immediately.  In this
+         * case the 'disable' method will be called with 'lazy' set to 0.
+         * This is mainly useful for error paths.
+         *
+         * Because lazy disable may be called from a work queue, the 'disable'
+         * method must claim the host when 'lazy' != 0, which will work
+         * correctly because recursion is detected and handled.
          */
         int (*enable)(struct mmc_host *host);
-        int (*disable)(struct mmc_host *host);
+        int (*disable)(struct mmc_host *host, int lazy);
         /*
          * It is optional for the host to implement pre_req and post_req in
          * order to support double buffering of requests (prepare one
          * request while another request is active).
-         * pre_req() must always be followed by a post_req().
-         * To undo a call made to pre_req(), call post_req() with
-         * a nonzero err condition.
          */
         void    (*post_req)(struct mmc_host *host, struct mmc_request *req,
                             int err);
@@ -130,13 +145,9 @@ struct mmc_host_ops {
         void    (*init_card)(struct mmc_host *host, struct mmc_card *card);
 
         int     (*start_signal_voltage_switch)(struct mmc_host *host, struct mmc_ios *ios);
-
-        /* The tuning command opcode value is different for SD and eMMC cards */
-        int     (*execute_tuning)(struct mmc_host *host, u32 opcode);
+        int     (*execute_tuning)(struct mmc_host *host);
         void    (*enable_preset_value)(struct mmc_host *host, bool enable);
         int     (*select_drive_strength)(unsigned int max_dtr, int host_drv, int card_drv);
-        void    (*hw_reset)(struct mmc_host *host);
-        void    (*card_event)(struct mmc_host *host);
 };
 
 struct mmc_card;
@@ -152,31 +163,6 @@ struct mmc_async_req {
         int (*err_check) (struct mmc_card *, struct mmc_async_req *);
 };
 
-/**
- * struct mmc_slot - MMC slot functions
- *
- * @cd_irq:             MMC/SD-card slot hotplug detection IRQ or -EINVAL
- * @lock:               protect the @handler_priv pointer
- * @handler_priv:       MMC/SD-card slot context
- *
- * Some MMC/SD host controllers implement slot-functions like card and
- * write-protect detection natively. However, a large number of controllers
- * leave these functions to the CPU. This struct provides a hook to attach
- * such slot-function drivers.
- */
-struct mmc_slot {
-        int cd_irq;
-        struct mutex lock;
-        void *handler_priv;
-};
-
-struct regulator;
-
-struct mmc_supply {
-        struct regulator *vmmc;         /* Card power supply */
-        struct regulator *vqmmc;        /* Optional Vccq supply */
-};
-
 struct mmc_host {
         struct device           *parent;
         struct device           class_dev;
@@ -190,9 +176,6 @@ struct mmc_host {
         u32                     ocr_avail_sd;   /* SD-specific OCR */
         u32                     ocr_avail_mmc;  /* MMC-specific OCR */
         struct notifier_block   pm_notify;
-        u32                     max_current_330;
-        u32                     max_current_300;
-        u32                     max_current_180;
 
 #define MMC_VDD_165_195         0x00000080      /* VDD voltage 1.65 - 1.95 */
 #define MMC_VDD_20_21           0x00000100      /* VDD voltage 2.0 ~ 2.1 */
@@ -212,7 +195,7 @@ struct mmc_host {
 #define MMC_VDD_34_35           0x00400000      /* VDD voltage 3.4 ~ 3.5 */
 #define MMC_VDD_35_36           0x00800000      /* VDD voltage 3.5 ~ 3.6 */
 
-        u32                     caps;           /* Host capabilities */
+        unsigned long           caps;           /* Host capabilities */
 
 #define MMC_CAP_4_BIT_DATA      (1 << 0)        /* Can the host do 4 bit transfers */
 #define MMC_CAP_MMC_HIGHSPEED   (1 << 1)        /* Can do MMC high-speed timing */
@@ -221,7 +204,7 @@ struct mmc_host {
 #define MMC_CAP_SPI             (1 << 4)        /* Talks only SPI protocols */
 #define MMC_CAP_NEEDS_POLL      (1 << 5)        /* Needs polling for card-detection */
 #define MMC_CAP_8_BIT_DATA      (1 << 6)        /* Can the host do 8 bit transfers */
-
+#define MMC_CAP_DISABLE         (1 << 7)        /* Can the host be disabled */
 #define MMC_CAP_NONREMOVABLE    (1 << 8)        /* Nonremovable e.g. eMMC */
 #define MMC_CAP_WAIT_WHILE_BUSY (1 << 9)        /* Waits while card is busy */
 #define MMC_CAP_ERASE           (1 << 10)       /* Allow erase/trim commands */
@@ -236,28 +219,18 @@ struct mmc_host {
 #define MMC_CAP_UHS_SDR50       (1 << 17)       /* Host supports UHS SDR50 mode */
 #define MMC_CAP_UHS_SDR104      (1 << 18)       /* Host supports UHS SDR104 mode */
 #define MMC_CAP_UHS_DDR50       (1 << 19)       /* Host supports UHS DDR50 mode */
+#define MMC_CAP_SET_XPC_330     (1 << 20)       /* Host supports >150mA current at 3.3V */
+#define MMC_CAP_SET_XPC_300     (1 << 21)       /* Host supports >150mA current at 3.0V */
+#define MMC_CAP_SET_XPC_180     (1 << 22)       /* Host supports >150mA current at 1.8V */
 #define MMC_CAP_DRIVER_TYPE_A   (1 << 23)       /* Host supports Driver Type A */
 #define MMC_CAP_DRIVER_TYPE_C   (1 << 24)       /* Host supports Driver Type C */
 #define MMC_CAP_DRIVER_TYPE_D   (1 << 25)       /* Host supports Driver Type D */
+#define MMC_CAP_MAX_CURRENT_200 (1 << 26)       /* Host max current limit is 200mA */
+#define MMC_CAP_MAX_CURRENT_400 (1 << 27)       /* Host max current limit is 400mA */
+#define MMC_CAP_MAX_CURRENT_600 (1 << 28)       /* Host max current limit is 600mA */
+#define MMC_CAP_MAX_CURRENT_800 (1 << 29)       /* Host max current limit is 800mA */
 #define MMC_CAP_CMD23           (1 << 30)       /* CMD23 supported. */
-#define MMC_CAP_HW_RESET        (1 << 31)       /* Hardware reset */
-
-        u32                     caps2;          /* More host capabilities */
-
-#define MMC_CAP2_BOOTPART_NOACC (1 << 0)        /* Boot partition no access */
-#define MMC_CAP2_CACHE_CTRL     (1 << 1)        /* Allow cache control */
-#define MMC_CAP2_POWEROFF_NOTIFY (1 << 2)       /* Notify poweroff supported */
-#define MMC_CAP2_NO_MULTI_READ  (1 << 3)        /* Multiblock reads don't work */
-#define MMC_CAP2_NO_SLEEP_CMD   (1 << 4)        /* Don't allow sleep command */
-#define MMC_CAP2_HS200_1_8V_SDR (1 << 5)        /* can support */
-#define MMC_CAP2_HS200_1_2V_SDR (1 << 6)        /* can support */
-#define MMC_CAP2_HS200          (MMC_CAP2_HS200_1_8V_SDR | \
-                                 MMC_CAP2_HS200_1_2V_SDR)
-#define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)        /* Use the broken voltage */
-#define MMC_CAP2_DETECT_ON_ERR  (1 << 8)        /* On I/O err check card removal */
-#define MMC_CAP2_HC_ERASE_SZ    (1 << 9)        /* High-capacity erase size */
-#define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10)       /* Card-detect signal active high */
-#define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11)       /* Write-protect signal active high */
+#define MMC_CAP_BKOPS           (1 << 31)       /* Host supports BKOPS */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
 
@@ -265,12 +238,10 @@ struct mmc_host {
         int                     clk_requests;   /* internal reference counter */
         unsigned int            clk_delay;      /* number of MCI clk hold cycles */
         bool                    clk_gated;      /* clock gated */
-        struct delayed_work     clk_gate_work; /* delayed clock gate */
+        struct work_struct      clk_gate_work; /* delayed clock gate */
         unsigned int            clk_old;        /* old clock value cache */
         spinlock_t              clk_lock;       /* lock for clk fields */
         struct mutex            clk_gate_mutex; /* mutex for clock gating */
-        struct device_attribute clkgate_delay_attr;
-        unsigned long           clkgate_delay;
 #endif
 
         /* host specific block data */
@@ -296,8 +267,13 @@ struct mmc_host {
         unsigned int            removed:1;      /* host is being removed */
 #endif
 
+        /* Only used with MMC_CAP_DISABLE */
+        int                     enabled;        /* host is enabled */
         int                     rescan_disable; /* disable card detection */
-        int                     rescan_entered; /* used with nonremovable devices */
+        int                     nesting_cnt;    /* "enable" nesting count */
+        int                     en_dis_recurs;  /* detect recursion */
+        unsigned int            disable_delay;  /* disable delay in msecs */
+        struct delayed_work     disable;        /* disabling work */
 
         struct mmc_card         *card;          /* device attached to this host */
 
@@ -306,15 +282,17 @@ struct mmc_host {
         int                     claim_cnt;      /* "claim" nesting count */
 
         struct delayed_work     detect;
-        int                     detect_change;  /* card detect flag */
-        struct mmc_slot         slot;
+        struct wake_lock        detect_wake_lock;
 
         const struct mmc_bus_ops *bus_ops;      /* current bus driver */
         unsigned int            bus_refs;       /* reference counter */
 
+        unsigned int            bus_resume_flags;
+#define MMC_BUSRESUME_MANUAL_RESUME     (1 << 0)
+#define MMC_BUSRESUME_NEEDS_RESUME      (1 << 1)
+
         unsigned int            sdio_irqs;
         struct task_struct      *sdio_irq_thread;
-        bool                    sdio_irq_pending;
         atomic_t                sdio_irq_thread_abort;
 
         mmc_pm_flag_t           pm_flags;       /* requested pm features */
@@ -326,18 +304,20 @@ struct mmc_host {
 #ifdef CONFIG_REGULATOR
         bool                    regulator_enabled; /* regulator state */
 #endif
-        struct mmc_supply       supply;
 
         struct dentry           *debugfs_root;
 
         struct mmc_async_req    *areq;          /* active async req */
 
-#ifdef CONFIG_FAIL_MMC_REQUEST
-        struct fault_attr       fail_mmc_request;
+#ifdef CONFIG_MMC_EMBEDDED_SDIO
+        struct {
+                struct sdio_cis                 *cis;
+                struct sdio_cccr                *cccr;
+                struct sdio_embedded_func       *funcs;
+                int                             num_funcs;
+        } embedded_sdio_data;
 #endif
 
-        unsigned int            actual_clock;   /* Actual HC clock rate */
-
         unsigned long           private[0] ____cacheline_aligned;
 };
 
@@ -346,6 +326,14 @@ extern int mmc_add_host(struct mmc_host *);
 extern void mmc_remove_host(struct mmc_host *);
 extern void mmc_free_host(struct mmc_host *);
 
+#ifdef CONFIG_MMC_EMBEDDED_SDIO
+extern void mmc_set_embedded_sdio_data(struct mmc_host *host,
+                                       struct sdio_cis *cis,
+                                       struct sdio_cccr *cccr,
+                                       struct sdio_embedded_func *funcs,
+                                       int num_funcs);
+#endif
+
 static inline void *mmc_priv(struct mmc_host *host)
 {
         return (void *)host->private;
@@ -356,6 +344,18 @@ static inline void *mmc_priv(struct mmc_host *host)
 #define mmc_dev(x)      ((x)->parent)
 #define mmc_classdev(x) (&(x)->class_dev)
 #define mmc_hostname(x) (dev_name(&(x)->class_dev))
+#define mmc_bus_needs_resume(host) ((host)->bus_resume_flags & MMC_BUSRESUME_NEEDS_RESUME)
+#define mmc_bus_manual_resume(host) ((host)->bus_resume_flags & MMC_BUSRESUME_MANUAL_RESUME)
+
+static inline void mmc_set_bus_resume_policy(struct mmc_host *host, int manual)
+{
+        if (manual)
+                host->bus_resume_flags |= MMC_BUSRESUME_MANUAL_RESUME;
+        else
+                host->bus_resume_flags &= ~MMC_BUSRESUME_MANUAL_RESUME;
+}
+
+extern int mmc_resume_bus(struct mmc_host *host);
 
 extern int mmc_suspend_host(struct mmc_host *);
 extern int mmc_resume_host(struct mmc_host *);
@@ -366,21 +366,19 @@ extern int mmc_power_restore_host(struct mmc_host *host);
 extern void mmc_detect_change(struct mmc_host *, unsigned long delay);
 extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
 
-extern int mmc_cache_ctrl(struct mmc_host *, u8);
-
 static inline void mmc_signal_sdio_irq(struct mmc_host *host)
 {
         host->ops->enable_sdio_irq(host, 0);
-        host->sdio_irq_pending = true;
         wake_up_process(host->sdio_irq_thread);
 }
 
+struct regulator;
+
 #ifdef CONFIG_REGULATOR
 int mmc_regulator_get_ocrmask(struct regulator *supply);
 int mmc_regulator_set_ocr(struct mmc_host *mmc,
                         struct regulator *supply,
                         unsigned short vdd_bit);
-int mmc_regulator_get_supply(struct mmc_host *mmc);
 #else
 static inline int mmc_regulator_get_ocrmask(struct regulator *supply)
 {
@@ -393,21 +391,25 @@ static inline int mmc_regulator_set_ocr(struct mmc_host *mmc,
 {
         return 0;
 }
-
-static inline int mmc_regulator_get_supply(struct mmc_host *mmc)
-{
-        return 0;
-}
 #endif
 
 int mmc_card_awake(struct mmc_host *host);
 int mmc_card_sleep(struct mmc_host *host);
 int mmc_card_can_sleep(struct mmc_host *host);
 
+int mmc_host_enable(struct mmc_host *host);
+int mmc_host_disable(struct mmc_host *host);
+int mmc_host_lazy_disable(struct mmc_host *host);
 int mmc_pm_notify(struct notifier_block *notify_block, unsigned long, void *);
 
+static inline void mmc_set_disable_delay(struct mmc_host *host,
+                                         unsigned int disable_delay)
+{
+        host->disable_delay = disable_delay;
+}
+
 /* Module parameter */
-extern bool mmc_assume_removable;
+extern int mmc_assume_removable;
 
 static inline int mmc_card_is_removable(struct mmc_host *host)
 {
@@ -428,29 +430,4 @@ static inline int mmc_host_cmd23(struct mmc_host *host)
 {
         return host->caps & MMC_CAP_CMD23;
 }
-
-static inline int mmc_boot_partition_access(struct mmc_host *host)
-{
-        return !(host->caps2 & MMC_CAP2_BOOTPART_NOACC);
-}
-
-#ifdef CONFIG_MMC_CLKGATE
-void mmc_host_clk_hold(struct mmc_host *host);
-void mmc_host_clk_release(struct mmc_host *host);
-unsigned int mmc_host_clk_rate(struct mmc_host *host);
-
-#else
-static inline void mmc_host_clk_hold(struct mmc_host *host)
-{
-}
-
-static inline void mmc_host_clk_release(struct mmc_host *host)
-{
-}
-
-static inline unsigned int mmc_host_clk_rate(struct mmc_host *host)
-{
-        return host->ios.clock;
-}
-#endif
 #endif /* LINUX_MMC_HOST_H */
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 94d532e41c6..2bb1dfd4cf1 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -51,7 +51,6 @@
 #define MMC_READ_SINGLE_BLOCK    17   /* adtc [31:0] data addr   R1  */
 #define MMC_READ_MULTIPLE_BLOCK  18   /* adtc [31:0] data addr   R1  */
 #define MMC_SEND_TUNING_BLOCK    19   /* adtc                    R1  */
-#define MMC_SEND_TUNING_BLOCK_HS200     21      /* adtc R1  */
 
   /* class 3 */
 #define MMC_WRITE_DAT_UNTIL_STOP 20   /* adtc [31:0] data addr   R1  */
@@ -139,7 +138,7 @@ static inline bool mmc_op_multi(u32 opcode)
 #define R1_CURRENT_STATE(x)     ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
 #define R1_READY_FOR_DATA       (1 << 8)        /* sx, a */
 #define R1_SWITCH_ERROR         (1 << 7)        /* sx, c */
-#define R1_EXCEPTION_EVENT      (1 << 6)        /* sx, a */
+#define R1_URGENT_BKOPS (1 << 6)        /* sr, a */
 #define R1_APP_CMD              (1 << 5)        /* sr, c */
 
 #define R1_STATE_IDLE   0
@@ -272,37 +271,22 @@ struct _mmc_csd {
  * EXT_CSD fields
  */
 
-#define EXT_CSD_FLUSH_CACHE             32      /* W */
-#define EXT_CSD_CACHE_CTRL              33      /* R/W */
-#define EXT_CSD_POWER_OFF_NOTIFICATION  34      /* R/W */
-#define EXT_CSD_EXP_EVENTS_STATUS       54      /* RO */
-#define EXT_CSD_DATA_SECTOR_SIZE        61      /* R */
-#define EXT_CSD_GP_SIZE_MULT            143     /* R/W */
 #define EXT_CSD_PARTITION_ATTRIBUTE     156     /* R/W */
 #define EXT_CSD_PARTITION_SUPPORT       160     /* RO */
 #define EXT_CSD_HPI_MGMT                161     /* R/W */
-#define EXT_CSD_RST_N_FUNCTION          162     /* R/W */
 #define EXT_CSD_BKOPS_EN                163     /* R/W */
-#define EXT_CSD_BKOPS_START             164     /* W */
-#define EXT_CSD_SANITIZE_START          165     /* W */
+#define EXT_CSD_BKOPS_START             164     /* R/W */
 #define EXT_CSD_WR_REL_PARAM            166     /* RO */
-#define EXT_CSD_RPMB_MULT               168     /* RO */
-#define EXT_CSD_BOOT_WP                 173     /* R/W */
 #define EXT_CSD_ERASE_GROUP_DEF         175     /* R/W */
 #define EXT_CSD_PART_CONFIG             179     /* R/W */
 #define EXT_CSD_ERASED_MEM_CONT         181     /* RO */
 #define EXT_CSD_BUS_WIDTH               183     /* R/W */
 #define EXT_CSD_HS_TIMING               185     /* R/W */
-#define EXT_CSD_POWER_CLASS             187     /* R/W */
 #define EXT_CSD_REV                     192     /* RO */
 #define EXT_CSD_STRUCTURE               194     /* RO */
 #define EXT_CSD_CARD_TYPE               196     /* RO */
 #define EXT_CSD_OUT_OF_INTERRUPT_TIME   198     /* RO */
 #define EXT_CSD_PART_SWITCH_TIME        199     /* RO */
-#define EXT_CSD_PWR_CL_52_195           200     /* RO */
-#define EXT_CSD_PWR_CL_26_195           201     /* RO */
-#define EXT_CSD_PWR_CL_52_360           202     /* RO */
-#define EXT_CSD_PWR_CL_26_360           203     /* RO */
 #define EXT_CSD_SEC_CNT                 212     /* RO, 4 bytes */
 #define EXT_CSD_S_A_TIMEOUT             217     /* RO */
 #define EXT_CSD_REL_WR_SEC_C            222     /* RO */
@@ -314,16 +298,7 @@ struct _mmc_csd {
 #define EXT_CSD_SEC_ERASE_MULT          230     /* RO */
 #define EXT_CSD_SEC_FEATURE_SUPPORT     231     /* RO */
 #define EXT_CSD_TRIM_MULT               232     /* RO */
-#define EXT_CSD_PWR_CL_200_195          236     /* RO */
-#define EXT_CSD_PWR_CL_200_360          237     /* RO */
-#define EXT_CSD_PWR_CL_DDR_52_195       238     /* RO */
-#define EXT_CSD_PWR_CL_DDR_52_360       239     /* RO */
 #define EXT_CSD_BKOPS_STATUS            246     /* RO */
-#define EXT_CSD_POWER_OFF_LONG_TIME     247     /* RO */
-#define EXT_CSD_GENERIC_CMD6_TIME       248     /* RO */
-#define EXT_CSD_CACHE_SIZE              249     /* RO, 4 bytes */
-#define EXT_CSD_TAG_UNIT_SIZE           498     /* RO */
-#define EXT_CSD_DATA_TAG_SUPPORT        499     /* RO */
 #define EXT_CSD_BKOPS_SUPPORT           502     /* RO */
 #define EXT_CSD_HPI_FEATURES            503     /* RO */
 
@@ -333,17 +308,9 @@ struct _mmc_csd {
 
 #define EXT_CSD_WR_REL_PARAM_EN         (1<<2)
 
-#define EXT_CSD_BOOT_WP_B_PWR_WP_DIS    (0x40)
-#define EXT_CSD_BOOT_WP_B_PERM_WP_DIS   (0x10)
-#define EXT_CSD_BOOT_WP_B_PERM_WP_EN    (0x04)
-#define EXT_CSD_BOOT_WP_B_PWR_WP_EN     (0x01)
-
 #define EXT_CSD_PART_CONFIG_ACC_MASK    (0x7)
 #define EXT_CSD_PART_CONFIG_ACC_BOOT0   (0x1)
-#define EXT_CSD_PART_CONFIG_ACC_RPMB    (0x3)
-#define EXT_CSD_PART_CONFIG_ACC_GP0     (0x4)
-
-#define EXT_CSD_PART_SUPPORT_PART_EN    (0x1)
+#define EXT_CSD_PART_CONFIG_ACC_BOOT1   (0x2)
 
 #define EXT_CSD_CMD_SET_NORMAL          (1<<0)
 #define EXT_CSD_CMD_SET_SECURE          (1<<1)
@@ -351,16 +318,13 @@ struct _mmc_csd {
 
 #define EXT_CSD_CARD_TYPE_26    (1<<0)  /* Card can run at 26MHz */
 #define EXT_CSD_CARD_TYPE_52    (1<<1)  /* Card can run at 52MHz */
-#define EXT_CSD_CARD_TYPE_MASK  0x3F    /* Mask out reserved bits */
+#define EXT_CSD_CARD_TYPE_MASK  0xF     /* Mask out reserved bits */
 #define EXT_CSD_CARD_TYPE_DDR_1_8V  (1<<2)   /* Card can run at 52MHz */
                                              /* DDR mode @1.8V or 3V I/O */
 #define EXT_CSD_CARD_TYPE_DDR_1_2V  (1<<3)   /* Card can run at 52MHz */
                                              /* DDR mode @1.2V I/O */
 #define EXT_CSD_CARD_TYPE_DDR_52       (EXT_CSD_CARD_TYPE_DDR_1_8V  \
                                         | EXT_CSD_CARD_TYPE_DDR_1_2V)
-#define EXT_CSD_CARD_TYPE_SDR_1_8V      (1<<4)  /* Card can run at 200MHz */
-#define EXT_CSD_CARD_TYPE_SDR_1_2V      (1<<5)  /* Card can run at 200MHz */
-                                                /* SDR mode @1.2V I/O */
 
 #define EXT_CSD_BUS_WIDTH_1     0       /* Card is in 1 bit mode */
 #define EXT_CSD_BUS_WIDTH_4     1       /* Card is in 4 bit mode */
@@ -371,32 +335,6 @@ struct _mmc_csd {
 #define EXT_CSD_SEC_ER_EN       BIT(0)
 #define EXT_CSD_SEC_BD_BLK_EN   BIT(2)
 #define EXT_CSD_SEC_GB_CL_EN    BIT(4)
-#define EXT_CSD_SEC_SANITIZE    BIT(6)  /* v4.5 only */
-
-#define EXT_CSD_RST_N_EN_MASK   0x3
-#define EXT_CSD_RST_N_ENABLED   1       /* RST_n is enabled on card */
-
-#define EXT_CSD_NO_POWER_NOTIFICATION   0
-#define EXT_CSD_POWER_ON                1
-#define EXT_CSD_POWER_OFF_SHORT         2
-#define EXT_CSD_POWER_OFF_LONG          3
-
-#define EXT_CSD_PWR_CL_8BIT_MASK        0xF0    /* 8 bit PWR CLS */
-#define EXT_CSD_PWR_CL_4BIT_MASK        0x0F    /* 8 bit PWR CLS */
-#define EXT_CSD_PWR_CL_8BIT_SHIFT       4
-#define EXT_CSD_PWR_CL_4BIT_SHIFT       0
-/*
- * EXCEPTION_EVENT_STATUS field
- */
-#define EXT_CSD_URGENT_BKOPS            BIT(0)
-#define EXT_CSD_DYNCAP_NEEDED           BIT(1)
-#define EXT_CSD_SYSPOOL_EXHAUSTED       BIT(2)
-#define EXT_CSD_PACKED_FAILURE          BIT(3)
-
-/*
- * BKOPS status level
- */
-#define EXT_CSD_BKOPS_LEVEL_2           0x2
 
 /*
  * MMC_SWITCH access modes
diff --git a/include/linux/mmc/pm.h b/include/linux/mmc/pm.h
index 4a139204c20..6e2d6a135c7 100644
--- a/include/linux/mmc/pm.h
+++ b/include/linux/mmc/pm.h
@@ -26,5 +26,6 @@ typedef unsigned int mmc_pm_flag_t;
 
 #define MMC_PM_KEEP_POWER       (1 << 0)        /* preserve card power during suspend */
 #define MMC_PM_WAKE_SDIO_IRQ    (1 << 1)        /* wake up host system on SDIO IRQ assertion */
+#define MMC_PM_IGNORE_PM_NOTIFY (1 << 2)        /* ignore mmc pm notify */
 
 #endif /* LINUX_MMC_PM_H */
diff --git a/include/linux/mmc/sdhci-pci-data.h b/include/linux/mmc/sdhci-pci-data.h
deleted file mode 100644
index 8959604a13d..00000000000
--- a/include/linux/mmc/sdhci-pci-data.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef LINUX_MMC_SDHCI_PCI_DATA_H
-#define LINUX_MMC_SDHCI_PCI_DATA_H
-
-struct pci_dev;
-
-struct sdhci_pci_data {
-        struct pci_dev  *pdev;
-        int             slotno;
-        int             rst_n_gpio; /* Set to -EINVAL if unused */
-        int             cd_gpio;    /* Set to -EINVAL if unused */
-        int             (*setup)(struct sdhci_pci_data *data);
-        void            (*cleanup)(struct sdhci_pci_data *data);
-};
-
-extern struct sdhci_pci_data *(*sdhci_pci_get_data)(struct pci_dev *pdev,
-                                int slotno);
-
-#endif
diff --git a/include/linux/mmc/sdhci-spear.h b/include/linux/mmc/sdhci-spear.h
index e78c0e236e9..5cdc96da9dd 100644
--- a/include/linux/mmc/sdhci-spear.h
+++ b/include/linux/mmc/sdhci-spear.h
@@ -4,7 +4,7 @@
  * SDHCI declarations specific to ST SPEAr platform
  *
  * Copyright (C) 2010 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar<viresh.kumar@st.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 4bbc3301fbb..5ee48390dec 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -21,87 +21,85 @@ struct sdhci_host {
         /* Data set by hardware interface driver */
         const char *hw_name;    /* Hardware bus name */
 
-        unsigned int quirks;    /* Deviations from spec. */
+        u64 quirks;     /* Deviations from spec. */
 
 /* Controller doesn't honor resets unless we touch the clock register */
-#define SDHCI_QUIRK_CLOCK_BEFORE_RESET                  (1<<0)
+#define SDHCI_QUIRK_CLOCK_BEFORE_RESET                  (1ULL<<0)
 /* Controller has bad caps bits, but really supports DMA */
-#define SDHCI_QUIRK_FORCE_DMA                           (1<<1)
+#define SDHCI_QUIRK_FORCE_DMA                           (1ULL<<1)
 /* Controller doesn't like to be reset when there is no card inserted. */
-#define SDHCI_QUIRK_NO_CARD_NO_RESET                    (1<<2)
+#define SDHCI_QUIRK_NO_CARD_NO_RESET                    (1ULL<<2)
 /* Controller doesn't like clearing the power reg before a change */
-#define SDHCI_QUIRK_SINGLE_POWER_WRITE                  (1<<3)
+#define SDHCI_QUIRK_SINGLE_POWER_WRITE                  (1ULL<<3)
 /* Controller has flaky internal state so reset it on each ios change */
-#define SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS               (1<<4)
+#define SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS               (1ULL<<4)
 /* Controller has an unusable DMA engine */
-#define SDHCI_QUIRK_BROKEN_DMA                          (1<<5)
+#define SDHCI_QUIRK_BROKEN_DMA                          (1ULL<<5)
 /* Controller has an unusable ADMA engine */
-#define SDHCI_QUIRK_BROKEN_ADMA                         (1<<6)
+#define SDHCI_QUIRK_BROKEN_ADMA                         (1ULL<<6)
 /* Controller can only DMA from 32-bit aligned addresses */
-#define SDHCI_QUIRK_32BIT_DMA_ADDR                      (1<<7)
+#define SDHCI_QUIRK_32BIT_DMA_ADDR                      (1ULL<<7)
 /* Controller can only DMA chunk sizes that are a multiple of 32 bits */
-#define SDHCI_QUIRK_32BIT_DMA_SIZE                      (1<<8)
+#define SDHCI_QUIRK_32BIT_DMA_SIZE                      (1ULL<<8)
 /* Controller can only ADMA chunks that are a multiple of 32 bits */
-#define SDHCI_QUIRK_32BIT_ADMA_SIZE                     (1<<9)
+#define SDHCI_QUIRK_32BIT_ADMA_SIZE                     (1ULL<<9)
 /* Controller needs to be reset after each request to stay stable */
-#define SDHCI_QUIRK_RESET_AFTER_REQUEST                 (1<<10)
+#define SDHCI_QUIRK_RESET_AFTER_REQUEST                 (1ULL<<10)
 /* Controller needs voltage and power writes to happen separately */
-#define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER             (1<<11)
+#define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER             (1ULL<<11)
 /* Controller provides an incorrect timeout value for transfers */
-#define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL                  (1<<12)
+#define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL                  (1ULL<<12)
 /* Controller has an issue with buffer bits for small transfers */
-#define SDHCI_QUIRK_BROKEN_SMALL_PIO                    (1<<13)
+#define SDHCI_QUIRK_BROKEN_SMALL_PIO                    (1ULL<<13)
 /* Controller does not provide transfer-complete interrupt when not busy */
-#define SDHCI_QUIRK_NO_BUSY_IRQ                         (1<<14)
+#define SDHCI_QUIRK_NO_BUSY_IRQ                         (1ULL<<14)
 /* Controller has unreliable card detection */
-#define SDHCI_QUIRK_BROKEN_CARD_DETECTION               (1<<15)
+#define SDHCI_QUIRK_BROKEN_CARD_DETECTION               (1ULL<<15)
 /* Controller reports inverted write-protect state */
-#define SDHCI_QUIRK_INVERTED_WRITE_PROTECT              (1<<16)
+#define SDHCI_QUIRK_INVERTED_WRITE_PROTECT              (1ULL<<16)
 /* Controller has nonstandard clock management */
-#define SDHCI_QUIRK_NONSTANDARD_CLOCK                   (1<<17)
+#define SDHCI_QUIRK_NONSTANDARD_CLOCK                   (1ULL<<17)
 /* Controller does not like fast PIO transfers */
-#define SDHCI_QUIRK_PIO_NEEDS_DELAY                     (1<<18)
+#define SDHCI_QUIRK_PIO_NEEDS_DELAY                     (1ULL<<18)
 /* Controller losing signal/interrupt enable states after reset */
-#define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET            (1<<19)
+#define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET            (1ULL<<19)
 /* Controller has to be forced to use block size of 2048 bytes */
-#define SDHCI_QUIRK_FORCE_BLK_SZ_2048                   (1<<20)
+#define SDHCI_QUIRK_FORCE_BLK_SZ_2048                   (1ULL<<20)
 /* Controller cannot do multi-block transfers */
-#define SDHCI_QUIRK_NO_MULTIBLOCK                       (1<<21)
+#define SDHCI_QUIRK_NO_MULTIBLOCK                       (1ULL<<21)
 /* Controller can only handle 1-bit data transfers */
-#define SDHCI_QUIRK_FORCE_1_BIT_DATA                    (1<<22)
+#define SDHCI_QUIRK_FORCE_1_BIT_DATA                    (1ULL<<22)
 /* Controller needs 10ms delay between applying power and clock */
-#define SDHCI_QUIRK_DELAY_AFTER_POWER                   (1<<23)
+#define SDHCI_QUIRK_DELAY_AFTER_POWER                   (1ULL<<23)
 /* Controller uses SDCLK instead of TMCLK for data timeouts */
-#define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK             (1<<24)
+#define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK             (1ULL<<24)
 /* Controller reports wrong base clock capability */
-#define SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN               (1<<25)
+#define SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN               (1ULL<<25)
 /* Controller cannot support End Attribute in NOP ADMA descriptor */
-#define SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC               (1<<26)
+#define SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC               (1ULL<<26)
 /* Controller is missing device caps. Use caps provided by host */
-#define SDHCI_QUIRK_MISSING_CAPS                        (1<<27)
+#define SDHCI_QUIRK_MISSING_CAPS                        (1ULL<<27)
 /* Controller uses Auto CMD12 command to stop the transfer */
-#define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12              (1<<28)
+#define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12              (1ULL<<28)
 /* Controller doesn't have HISPD bit field in HI-SPEED SD card */
-#define SDHCI_QUIRK_NO_HISPD_BIT                        (1<<29)
+#define SDHCI_QUIRK_NO_HISPD_BIT                        (1ULL<<29)
 /* Controller treats ADMA descriptors with length 0000h incorrectly */
-#define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC            (1<<30)
+#define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC            (1ULL<<30)
 /* The read-only detection via SDHCI_PRESENT_STATE register is unstable */
-#define SDHCI_QUIRK_UNSTABLE_RO_DETECT                  (1<<31)
-
-        unsigned int quirks2;   /* More deviations from spec. */
-
-#define SDHCI_QUIRK2_HOST_OFF_CARD_ON                   (1<<0)
-#define SDHCI_QUIRK2_HOST_NO_CMD23                      (1<<1)
-/* The system physically doesn't support 1.8v, even if the host does */
-#define SDHCI_QUIRK2_NO_1_8_V                           (1<<2)
+#define SDHCI_QUIRK_UNSTABLE_RO_DETECT                  (1ULL<<31)
+/* Controller cannot report the line status in present state register */
+#define SDHCI_QUIRK_NON_STD_VOLTAGE_SWITCHING           (1ULL<<32)
+/* Controller doesn't follow the standard frequency tuning procedure */
+#define SDHCI_QUIRK_NON_STANDARD_TUNING                 (1ULL<<33)
+/* Controller doesn't calculate max_discard_to */
+#define SDHCI_QUIRK_NO_CALC_MAX_DISCARD_TO              (1ULL<<34)
 
         int irq;                /* Device IRQ */
         void __iomem *ioaddr;   /* Mapped address */
 
         const struct sdhci_ops *ops;    /* Low level hw interface */
 
-        struct regulator *vmmc;         /* Power regulator (vmmc) */
-        struct regulator *vqmmc;        /* Signaling regulator (vccq) */
+        struct regulator *vmmc; /* Power regulator */
 
         /* Internal data */
         struct mmc_host *mmc;   /* MMC structure */
@@ -123,10 +121,6 @@ struct sdhci_host {
 #define SDHCI_NEEDS_RETUNING    (1<<5)  /* Host needs retuning */
 #define SDHCI_AUTO_CMD12        (1<<6)  /* Auto CMD12 support */
 #define SDHCI_AUTO_CMD23        (1<<7)  /* Auto CMD23 support */
-#define SDHCI_PV_ENABLED        (1<<8)  /* Preset value enabled */
-#define SDHCI_SDIO_IRQ_ENABLED  (1<<9)  /* SDIO irq enabled */
-#define SDHCI_HS200_NEEDS_TUNING (1<<10)        /* HS200 needs tuning */
-#define SDHCI_USING_RETUNING_TIMER (1<<11)      /* Host is using a retuning timer for the card */
 
         unsigned int version;   /* SDHCI spec. version */
 
@@ -137,8 +131,6 @@ struct sdhci_host {
         unsigned int clock;     /* Current clock (MHz) */
         u8 pwr;                 /* Current voltage */
 
-        bool runtime_suspended; /* Host is runtime suspended */
-
         struct mmc_request *mrq;        /* Current request */
         struct mmc_command *cmd;        /* Current command */
         struct mmc_data *data;  /* Current data request */
@@ -159,9 +151,9 @@ struct sdhci_host {
         struct tasklet_struct finish_tasklet;
 
         struct timer_list timer;        /* Timer for timeouts */
+        unsigned int card_int_set;      /* card int status */
 
-        u32 caps;               /* Alternative CAPABILITY_0 */
-        u32 caps1;              /* Alternative CAPABILITY_1 */
+        unsigned int caps;      /* Alternative capabilities */
 
         unsigned int            ocr_avail_sdio; /* OCR bit masks */
         unsigned int            ocr_avail_sd;
diff --git a/include/linux/mmc/sdio.h b/include/linux/mmc/sdio.h
index 17446d3c360..666ff6b0aea 100644
--- a/include/linux/mmc/sdio.h
+++ b/include/linux/mmc/sdio.h
@@ -38,8 +38,8 @@
  *      [8:0] Byte/block count
  */
 
-#define R4_18V_PRESENT (1<<24)
-#define R4_MEMORY_PRESENT (1 << 27)
+#define R4_18V_PRESENT BIT(24)
+#define R4_MEMORY_PRESENT BIT(27)
 
 /*
   SDIO status in R5
@@ -98,9 +98,7 @@
 
 #define SDIO_CCCR_IF            0x07    /* bus interface controls */
 
-#define  SDIO_BUS_WIDTH_MASK    0x03    /* data bus width setting */
 #define  SDIO_BUS_WIDTH_1BIT    0x00
-#define  SDIO_BUS_WIDTH_RESERVED 0x01
 #define  SDIO_BUS_WIDTH_4BIT    0x02
 #define  SDIO_BUS_ECSI          0x20    /* Enable continuous SPI interrupt */
 #define  SDIO_BUS_SCSI          0x40    /* Support continuous SPI interrupt */
@@ -139,12 +137,12 @@
 
 #define  SDIO_SPEED_SHS         0x01    /* Supports High-Speed mode */
 #define  SDIO_SPEED_BSS_SHIFT   1
-#define  SDIO_SPEED_BSS_MASK    (7<<SDIO_SPEED_BSS_SHIFT)
-#define  SDIO_SPEED_SDR12       (0<<SDIO_SPEED_BSS_SHIFT)
-#define  SDIO_SPEED_SDR25       (1<<SDIO_SPEED_BSS_SHIFT)
-#define  SDIO_SPEED_SDR50       (2<<SDIO_SPEED_BSS_SHIFT)
-#define  SDIO_SPEED_SDR104      (3<<SDIO_SPEED_BSS_SHIFT)
-#define  SDIO_SPEED_DDR50       (4<<SDIO_SPEED_BSS_SHIFT)
+#define  SDIO_SPEED_BSS_MASK    (7 << SDIO_SPEED_BSS_SHIFT)
+#define  SDIO_SPEED_SDR12       (0 << SDIO_SPEED_BSS_SHIFT)
+#define  SDIO_SPEED_SDR25       (1 << SDIO_SPEED_BSS_SHIFT)
+#define  SDIO_SPEED_SDR50       (2 << SDIO_SPEED_BSS_SHIFT)
+#define  SDIO_SPEED_SDR104      (3 << SDIO_SPEED_BSS_SHIFT)
+#define  SDIO_SPEED_DDR50       (4 << SDIO_SPEED_BSS_SHIFT)
 #define  SDIO_SPEED_EHS         SDIO_SPEED_SDR25        /* Enable High-Speed */
 
 #define SDIO_CCCR_UHS           0x14
@@ -154,9 +152,9 @@
 
 #define SDIO_CCCR_DRIVE_STRENGTH 0x15
 #define  SDIO_SDTx_MASK         0x07
-#define  SDIO_DRIVE_SDTA        (1<<0)
-#define  SDIO_DRIVE_SDTC        (1<<1)
-#define  SDIO_DRIVE_SDTD        (1<<2)
+#define  SDIO_DRIVE_SDTA        (1 << 0)
+#define  SDIO_DRIVE_SDTC        (1 << 1)
+#define  SDIO_DRIVE_SDTD        (1 << 2)
 #define  SDIO_DRIVE_DTSx_MASK   0x03
 #define  SDIO_DRIVE_DTSx_SHIFT  4
 #define  SDIO_DTSx_SET_TYPE_B   (0 << SDIO_DRIVE_DTSx_SHIFT)
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index 50f0bc95232..dc680c4b50d 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -23,6 +23,14 @@ struct sdio_func;
 typedef void (sdio_irq_handler_t)(struct sdio_func *);
 
 /*
+ * Structure used to hold embedded SDIO device data from platform layer
+ */
+struct sdio_embedded_func {
+        uint8_t f_class;
+        uint32_t f_maxblksize;
+};
+
+/*
  * SDIO function CIS tuple (unknown to the core)
  */
 struct sdio_func_tuple {
@@ -130,6 +138,8 @@ extern int sdio_release_irq(struct sdio_func *func);
 extern unsigned int sdio_align_size(struct sdio_func *func, unsigned int sz);
 
 extern u8 sdio_readb(struct sdio_func *func, unsigned int addr, int *err_ret);
+extern u8 sdio_readb_ext(struct sdio_func *func, unsigned int addr, int *err_ret,
+        unsigned in);
 extern u16 sdio_readw(struct sdio_func *func, unsigned int addr, int *err_ret);
 extern u32 sdio_readl(struct sdio_func *func, unsigned int addr, int *err_ret);
 
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index e7d5dd67bb7..0222cd8ebe7 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -32,14 +32,16 @@
  * 1111 : Peripheral clock (sup_pclk set '1')
  */
 
+struct sh_mmcif_dma {
+        struct sh_dmae_slave chan_priv_tx;
+        struct sh_dmae_slave chan_priv_rx;
+};
+
 struct sh_mmcif_plat_data {
         void (*set_pwr)(struct platform_device *pdev, int state);
         void (*down_pwr)(struct platform_device *pdev);
         int (*get_cd)(struct platform_device *pdef);
-        unsigned int            slave_id_tx;    /* embedded slave_id_[tr]x */
-        unsigned int            slave_id_rx;
-        bool                    use_cd_gpio : 1;
-        unsigned int            cd_gpio;
+        struct sh_mmcif_dma     *dma;
         u8                      sup_pclk;       /* 1 :SH7757, 0: SH7724/SH7372 */
         unsigned long           caps;
         u32                     ocr;
@@ -73,15 +75,18 @@ struct sh_mmcif_plat_data {
 
 /* CE_CLK_CTRL */
 #define CLK_ENABLE              (1 << 24) /* 1: output mmc clock */
-#define CLK_CLEAR               (0xf << 16)
-#define CLK_SUP_PCLK            (0xf << 16)
-#define CLKDIV_4                (1 << 16) /* mmc clock frequency.
-                                           * n: bus clock/(2^(n+1)) */
-#define CLKDIV_256              (7 << 16) /* mmc clock frequency. (see above) */
-#define SRSPTO_256              (2 << 12) /* resp timeout */
-#define SRBSYTO_29              (0xf << 8) /* resp busy timeout */
-#define SRWDTO_29               (0xf << 4) /* read/write timeout */
-#define SCCSTO_29               (0xf << 0) /* ccs timeout */
+#define CLK_CLEAR               ((1 << 19) | (1 << 18) | (1 << 17) | (1 << 16))
+#define CLK_SUP_PCLK            ((1 << 19) | (1 << 18) | (1 << 17) | (1 << 16))
+#define CLKDIV_4                (1<<16) /* mmc clock frequency.
+                                         * n: bus clock/(2^(n+1)) */
+#define CLKDIV_256              (7<<16) /* mmc clock frequency. (see above) */
+#define SRSPTO_256              ((1 << 13) | (0 << 12)) /* resp timeout */
+#define SRBSYTO_29              ((1 << 11) | (1 << 10) |        \
+                                 (1 << 9) | (1 << 8)) /* resp busy timeout */
+#define SRWDTO_29               ((1 << 7) | (1 << 6) |          \
+                                 (1 << 5) | (1 << 4)) /* read/write timeout */
+#define SCCSTO_29               ((1 << 3) | (1 << 2) |          \
+                                 (1 << 1) | (1 << 0)) /* ccs timeout */
 
 /* CE_VERSION */
 #define SOFT_RST_ON             (1 << 31)
diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h
index b65679ffa88..bd50b365167 100644
--- a/include/linux/mmc/sh_mobile_sdhi.h
+++ b/include/linux/mmc/sh_mobile_sdhi.h
@@ -6,34 +6,15 @@
 struct platform_device;
 struct tmio_mmc_data;
 
-#define SH_MOBILE_SDHI_IRQ_CARD_DETECT  "card_detect"
-#define SH_MOBILE_SDHI_IRQ_SDCARD       "sdcard"
-#define SH_MOBILE_SDHI_IRQ_SDIO         "sdio"
-
-/**
- * struct sh_mobile_sdhi_ops - SDHI driver callbacks
- * @cd_wakeup:          trigger a card-detection run
- */
-struct sh_mobile_sdhi_ops {
-        void (*cd_wakeup)(const struct platform_device *pdev);
-};
-
 struct sh_mobile_sdhi_info {
         int dma_slave_tx;
         int dma_slave_rx;
         unsigned long tmio_flags;
         unsigned long tmio_caps;
-        unsigned long tmio_caps2;
         u32 tmio_ocr_mask;      /* available MMC voltages */
-        unsigned int cd_gpio;
         struct tmio_mmc_data *pdata;
         void (*set_pwr)(struct platform_device *pdev, int state);
         int (*get_cd)(struct platform_device *pdev);
-
-        /* callbacks for board specific setup code */
-        int (*init)(struct platform_device *pdev,
-                    const struct sh_mobile_sdhi_ops *ops);
-        void (*cleanup)(struct platform_device *pdev);
 };
 
 #endif /* LINUX_MMC_SH_MOBILE_SDHI_H */
diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h
deleted file mode 100644
index 7d88d27bfaf..00000000000
--- a/include/linux/mmc/slot-gpio.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Generic GPIO card-detect helper header
- *
- * Copyright (C) 2011, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
- *
- * 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.
- */
-
-#ifndef MMC_SLOT_GPIO_H
-#define MMC_SLOT_GPIO_H
-
-struct mmc_host;
-
-int mmc_gpio_get_ro(struct mmc_host *host);
-int mmc_gpio_request_ro(struct mmc_host *host, unsigned int gpio);
-void mmc_gpio_free_ro(struct mmc_host *host);
-
-int mmc_gpio_get_cd(struct mmc_host *host);
-int mmc_gpio_request_cd(struct mmc_host *host, unsigned int gpio);
-void mmc_gpio_free_cd(struct mmc_host *host);
-
-#endif