1 files changed, 10 insertions, 12 deletions

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f578a71d82a..61a10c17aab 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -53,12 +53,12 @@ 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    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_TIMING_MMC_HS200    6
+#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_SDR_MODE            0
 #define MMC_1_2V_DDR_MODE       1
@@ -136,6 +136,7 @@ struct mmc_host_ops {
         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;
@@ -211,7 +212,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 */
 
-        unsigned long           caps;           /* Host capabilities */
+        u32                     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 */
@@ -241,7 +242,7 @@ struct mmc_host {
 #define MMC_CAP_CMD23           (1 << 30)       /* CMD23 supported. */
 #define MMC_CAP_HW_RESET        (1 << 31)       /* Hardware reset */
 
-        unsigned int            caps2;          /* More host capabilities */
+        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 */
@@ -259,10 +260,6 @@ struct mmc_host {
 #define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11)       /* Write-protect signal active high */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
-        unsigned int        power_notify_type;
-#define MMC_HOST_PW_NOTIFY_NONE         0
-#define MMC_HOST_PW_NOTIFY_SHORT        1
-#define MMC_HOST_PW_NOTIFY_LONG         2
 
 #ifdef CONFIG_MMC_CLKGATE
         int                     clk_requests;   /* internal reference counter */
@@ -300,6 +297,7 @@ struct mmc_host {
 #endif
 
         int                     rescan_disable; /* disable card detection */
+        int                     rescan_entered; /* used with nonremovable devices */
 
         struct mmc_card         *card;          /* device attached to this host */