3 files changed, 11 insertions, 4 deletions

diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
index 116816fb9110..7815d8db7eca 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
@@ -334,6 +334,7 @@
 #define DCM_DRP_RD_DATA_H               0xFC29
 #define SD_VPCLK0_CTL                   0xFC2A
 #define SD_VPCLK1_CTL                   0xFC2B
+#define   PHASE_SELECT_MASK             0x1F
 #define SD_DCMPS0_CTL                   0xFC2C
 #define SD_DCMPS1_CTL                   0xFC2D
 #define SD_VPTX_CTL                     SD_VPCLK0_CTL
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 9a43763a68ad..e7743eca1021 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -255,6 +255,10 @@ struct mmc_supply {
         struct regulator *vqmmc;        /* Optional Vccq supply */
 };
 
+struct mmc_ctx {
+        struct task_struct *task;
+};
+
 struct mmc_host {
         struct device           *parent;
         struct device           class_dev;
@@ -350,6 +354,8 @@ struct mmc_host {
 #define MMC_CAP2_CQE            (1 << 23)       /* Has eMMC command queue engine */
 #define MMC_CAP2_CQE_DCMD       (1 << 24)       /* CQE can issue a direct command */
 
+        int                     fixed_drv_type; /* fixed driver type for non-removable media */
+
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
 
         /* host specific block data */
@@ -388,8 +394,9 @@ struct mmc_host {
         struct mmc_card         *card;          /* device attached to this host */
 
         wait_queue_head_t       wq;
-        struct task_struct      *claimer;       /* task that has host claimed */
+        struct mmc_ctx          *claimer;       /* context that has host claimed */
         int                     claim_cnt;      /* "claim" nesting count */
+        struct mmc_ctx          default_ctx;    /* default context */
 
         struct delayed_work     detect;
         int                     detect_change;  /* card detect flag */
@@ -469,6 +476,8 @@ void mmc_detect_change(struct mmc_host *, unsigned long delay);
 void mmc_request_done(struct mmc_host *, struct mmc_request *);
 void mmc_command_done(struct mmc_host *host, struct mmc_request *mrq);
 
+void mmc_cqe_request_done(struct mmc_host *host, struct mmc_request *mrq);
+
 static inline void mmc_signal_sdio_irq(struct mmc_host *host)
 {
         host->ops->enable_sdio_irq(host, 0);
diff --git a/include/linux/mmc/sdhci-pci-data.h b/include/linux/mmc/sdhci-pci-data.h
index 36f986d4a59a..1d42872d22f3 100644
--- a/include/linux/mmc/sdhci-pci-data.h
+++ b/include/linux/mmc/sdhci-pci-data.h
@@ -15,7 +15,4 @@ struct sdhci_pci_data {
 
 extern struct sdhci_pci_data *(*sdhci_pci_get_data)(struct pci_dev *pdev,
                                 int slotno);
-
-extern int sdhci_pci_spt_drive_strength;
-
 #endif