1 files changed, 60 insertions, 4 deletions

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 1ee4424462e..8c0bf3f2a36 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -12,6 +12,7 @@
 
 #include <linux/leds.h>
 #include <linux/sched.h>
+#include <linux/wakelock.h>
 
 #include <linux/mmc/core.h>
 #include <linux/mmc/pm.h>
@@ -56,8 +57,6 @@ struct mmc_ios {
 #define MMC_TIMING_UHS_SDR104   4
 #define MMC_TIMING_UHS_DDR50    5
 
-        unsigned char   ddr;                    /* dual data rate used */
-
 #define MMC_SDR_MODE            0
 #define MMC_1_2V_DDR_MODE       1
 #define MMC_1_8V_DDR_MODE       2
@@ -106,6 +105,15 @@ struct mmc_host_ops {
          */
         int (*enable)(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).
+         */
+        void    (*post_req)(struct mmc_host *host, struct mmc_request *req,
+                            int err);
+        void    (*pre_req)(struct mmc_host *host, struct mmc_request *req,
+                           bool is_first_req);
         void    (*request)(struct mmc_host *host, struct mmc_request *req);
         /*
          * Avoid calling these three functions too often or in a "fast path",
@@ -139,11 +147,22 @@ struct mmc_host_ops {
         int     (*start_signal_voltage_switch)(struct mmc_host *host, struct mmc_ios *ios);
         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);
 };
 
 struct mmc_card;
 struct device;
 
+struct mmc_async_req {
+        /* active mmc request */
+        struct mmc_request      *mrq;
+        /*
+         * Check error status of completed mmc request.
+         * Returns 0 if success otherwise non zero.
+         */
+        int (*err_check) (struct mmc_card *, struct mmc_async_req *);
+};
+
 struct mmc_host {
         struct device           *parent;
         struct device           class_dev;
@@ -211,6 +230,7 @@ struct mmc_host {
 #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_BKOPS           (1 << 31)       /* Host supports BKOPS */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
 
@@ -231,6 +251,7 @@ struct mmc_host {
         unsigned int            max_req_size;   /* maximum number of bytes in one req */
         unsigned int            max_blk_size;   /* maximum size of one mmc block */
         unsigned int            max_blk_count;  /* maximum number of blocks in one req */
+        unsigned int            max_discard_to; /* max. discard timeout in ms */
 
         /* private data */
         spinlock_t              lock;           /* lock for claim and bus ops */
@@ -261,10 +282,15 @@ struct mmc_host {
         int                     claim_cnt;      /* "claim" nesting count */
 
         struct delayed_work     detect;
+        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;
         atomic_t                sdio_irq_thread_abort;
@@ -281,6 +307,17 @@ struct mmc_host {
 
         struct dentry           *debugfs_root;
 
+        struct mmc_async_req    *areq;          /* active async req */
+
+#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 long           private[0] ____cacheline_aligned;
 };
 
@@ -289,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;
@@ -299,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 *);
@@ -373,5 +430,4 @@ static inline int mmc_host_cmd23(struct mmc_host *host)
 {
         return host->caps & MMC_CAP_CMD23;
 }
-#endif
-
+#endif /* LINUX_MMC_HOST_H */