Merge tag 'mmc-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC updates from Ulf Hansson:
 "It's been an busy period for mmc. Quite some changes in the mmc core,
  two new mmc host drivers, some existing drivers being extended to
  support new IP versions and lots of other updates.

  MMC core:
   - Delete eMMC packed command support
   - Introduce mmc_abort_tuning() to enable eMMC tuning to fail
     gracefully
   - Introduce mmc_can_retune() to see if a host can be retuned
   - Re-work and improve the sequence when sending a CMD6 for mmc
   - Enable CDM13 polling when switching to HS and HS DDR mode for mmc
   - Relax checking for CMD6 errors after switch to HS200
   - Re-factoring the code dealing with the mmc block queue
   - Recognize whether the eMMC card supports CMDQ
   - Fix 4K native sector check
   - Don't power off the card when starting the host
   - Increase MMC_IOC_MAX_BYTES to support bigger firmware binaries
   - Improve error handling and drop meaningless BUG_ONs()
   - Lots of clean-ups and changes to improve the quality of the code

  MMC host:
   - sdhci: Fix tuning sequence and clean-up the related code
   - sdhci: Add support to via DT override broken SDHCI cap register
     bits
   - sdhci-cadence: Add new driver for Cadence SD4HC SDHCI variant
   - sdhci-msm: Update clock management
   - sdhci-msm: Add support for eMMC HS400 mode
   - sdhci-msm: Deploy runtime/system PM support
   - sdhci-iproc: Extend driver support to newer IP versions
   - sdhci-pci: Add support for Intel GLK
   - sdhci-pci: Add support for Intel NI byt sdio
   - sdhci-acpi: Add support for 80860F14 UID 2 SDIO bus
   - sdhci: Lots of various small improvements and clean-ups
   - tmio: Add support for tuning
   - sh_mobile_sdhi: Add support for tuning
   - sh_mobile_sdhi: Extend driver to support SDHI IP on R7S72100 SoC
   - sh_mobile_sdhi: remove support for sh7372
   - davinci: Use mmc_of_parse() to enable generic mmc DT bindings
   - meson: Add new driver to support GX platforms
   - dw_mmc: Deploy generic runtime/system PM support
   - dw_mmc: Lots of various small improvements

  As a part of the mmc changes this time, I have also pulled in an
  immutable branch/tag (soc-device-match-tag1) hosted by Geert
  Uytterhoeven, to share the implementation of the new
  soc_device_match() interface. This is needed by these mmc related
  changes:

   - mmc: sdhci-of-esdhc: Get correct IP version for T4240-R1.0-R2.0
   - soc: fsl: add GUTS driver for QorIQ platforms"

* tag 'mmc-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (136 commits)
  mmc: sdhci-cadence: add Cadence SD4HC support
  mmc: sdhci: export sdhci_execute_tuning()
  mmc: sdhci: Tidy tuning loop
  mmc: sdhci: Simplify tuning block size logic
  mmc: sdhci: Factor out tuning helper functions
  mmc: sdhci: Use mmc_abort_tuning()
  mmc: mmc: Introduce mmc_abort_tuning()
  mmc: sdhci: Always allow tuning to fall back to fixed sampling
  mmc: sdhci: Fix tuning reset after exhausting the maximum number of loops
  mmc: sdhci: Fix recovery from tuning timeout
  Revert "mmc: sdhci: Reset cmd and data circuits after tuning failure"
  mmc: mmc: Relax checking for switch errors after HS200 switch
  mmc: sdhci-acpi: support 80860F14 UID 2 SDIO bus
  mmc: sdhci-of-at91: remove bogus MMC_SDHCI_IO_ACCESSORS select
  mmc: sdhci-pci: Use ACPI to get max frequency for Intel NI byt sdio
  mmc: sdhci-pci: Add PCI ID for Intel NI byt sdio
  mmc: sdhci-s3c: add spin_unlock_irq() before calling clk_round_rate
  mmc: dw_mmc: display the clock message only one time when card is polling
  mmc: dw_mmc: add the debug message for polling and non-removable
  mmc: dw_mmc: check the "present" variable before checking flags
  ...

10 files changed, 140 insertions, 72 deletions

diff --git a/include/linux/fsl/guts.h b/include/linux/fsl/guts.h
index 649e9171a9b3..3efa3b861d44 100644
--- a/include/linux/fsl/guts.h
+++ b/include/linux/fsl/guts.h
@@ -29,83 +29,112 @@
  * #ifdefs.
  */
 struct ccsr_guts {
-        __be32  porpllsr;       /* 0x.0000 - POR PLL Ratio Status Register */
-        __be32  porbmsr;        /* 0x.0004 - POR Boot Mode Status Register */
-        __be32  porimpscr;      /* 0x.0008 - POR I/O Impedance Status and Control Register */
-        __be32  pordevsr;       /* 0x.000c - POR I/O Device Status Register */
-        __be32  pordbgmsr;      /* 0x.0010 - POR Debug Mode Status Register */
-        __be32  pordevsr2;      /* 0x.0014 - POR device status register 2 */
+        u32     porpllsr;       /* 0x.0000 - POR PLL Ratio Status Register */
+        u32     porbmsr;        /* 0x.0004 - POR Boot Mode Status Register */
+        u32     porimpscr;      /* 0x.0008 - POR I/O Impedance Status and
+                                 *           Control Register
+                                 */
+        u32     pordevsr;       /* 0x.000c - POR I/O Device Status Register */
+        u32     pordbgmsr;      /* 0x.0010 - POR Debug Mode Status Register */
+        u32     pordevsr2;      /* 0x.0014 - POR device status register 2 */
         u8      res018[0x20 - 0x18];
-        __be32  porcir;         /* 0x.0020 - POR Configuration Information Register */
+        u32     porcir;         /* 0x.0020 - POR Configuration Information
+                                 *           Register
+                                 */
         u8      res024[0x30 - 0x24];
-        __be32  gpiocr;         /* 0x.0030 - GPIO Control Register */
+        u32     gpiocr;         /* 0x.0030 - GPIO Control Register */
         u8      res034[0x40 - 0x34];
-        __be32  gpoutdr;        /* 0x.0040 - General-Purpose Output Data Register */
+        u32     gpoutdr;        /* 0x.0040 - General-Purpose Output Data
+                                 *           Register
+                                 */
         u8      res044[0x50 - 0x44];
-        __be32  gpindr;         /* 0x.0050 - General-Purpose Input Data Register */
+        u32     gpindr;         /* 0x.0050 - General-Purpose Input Data
+                                 *           Register
+                                 */
         u8      res054[0x60 - 0x54];
-        __be32  pmuxcr;         /* 0x.0060 - Alternate Function Signal Multiplex Control */
-        __be32  pmuxcr2;        /* 0x.0064 - Alternate function signal multiplex control 2 */
-        __be32  dmuxcr;         /* 0x.0068 - DMA Mux Control Register */
+        u32     pmuxcr;         /* 0x.0060 - Alternate Function Signal
+                                 *           Multiplex Control
+                                 */
+        u32     pmuxcr2;        /* 0x.0064 - Alternate function signal
+                                 *           multiplex control 2
+                                 */
+        u32     dmuxcr;         /* 0x.0068 - DMA Mux Control Register */
         u8      res06c[0x70 - 0x6c];
-        __be32  devdisr;        /* 0x.0070 - Device Disable Control */
+        u32     devdisr;        /* 0x.0070 - Device Disable Control */
 #define CCSR_GUTS_DEVDISR_TB1   0x00001000
 #define CCSR_GUTS_DEVDISR_TB0   0x00004000
-        __be32  devdisr2;       /* 0x.0074 - Device Disable Control 2 */
+        u32     devdisr2;       /* 0x.0074 - Device Disable Control 2 */
         u8      res078[0x7c - 0x78];
-        __be32  pmjcr;          /* 0x.007c - 4 Power Management Jog Control Register */
-        __be32  powmgtcsr;      /* 0x.0080 - Power Management Status and Control Register */
-        __be32  pmrccr;         /* 0x.0084 - Power Management Reset Counter Configuration Register */
-        __be32  pmpdccr;        /* 0x.0088 - Power Management Power Down Counter Configuration Register */
-        __be32  pmcdr;          /* 0x.008c - 4Power management clock disable register */
-        __be32  mcpsumr;        /* 0x.0090 - Machine Check Summary Register */
-        __be32  rstrscr;        /* 0x.0094 - Reset Request Status and Control Register */
-        __be32  ectrstcr;       /* 0x.0098 - Exception reset control register */
-        __be32  autorstsr;      /* 0x.009c - Automatic reset status register */
-        __be32  pvr;            /* 0x.00a0 - Processor Version Register */
-        __be32  svr;            /* 0x.00a4 - System Version Register */
+        u32     pmjcr;          /* 0x.007c - 4 Power Management Jog Control
+                                 *           Register
+                                 */
+        u32     powmgtcsr;      /* 0x.0080 - Power Management Status and
+                                 *           Control Register
+                                 */
+        u32     pmrccr;         /* 0x.0084 - Power Management Reset Counter
+                                 *           Configuration Register
+                                 */
+        u32     pmpdccr;        /* 0x.0088 - Power Management Power Down Counter
+                                 *           Configuration Register
+                                 */
+        u32     pmcdr;          /* 0x.008c - 4Power management clock disable
+                                 *           register
+                                 */
+        u32     mcpsumr;        /* 0x.0090 - Machine Check Summary Register */
+        u32     rstrscr;        /* 0x.0094 - Reset Request Status and
+                                 *           Control Register
+                                 */
+        u32     ectrstcr;       /* 0x.0098 - Exception reset control register */
+        u32     autorstsr;      /* 0x.009c - Automatic reset status register */
+        u32     pvr;            /* 0x.00a0 - Processor Version Register */
+        u32     svr;            /* 0x.00a4 - System Version Register */
         u8      res0a8[0xb0 - 0xa8];
-        __be32  rstcr;          /* 0x.00b0 - Reset Control Register */
+        u32     rstcr;          /* 0x.00b0 - Reset Control Register */
         u8      res0b4[0xc0 - 0xb4];
-        __be32  iovselsr;       /* 0x.00c0 - I/O voltage select status register
+        u32     iovselsr;       /* 0x.00c0 - I/O voltage select status register
                                              Called 'elbcvselcr' on 86xx SOCs */
         u8      res0c4[0x100 - 0xc4];
-        __be32  rcwsr[16];      /* 0x.0100 - Reset Control Word Status registers
+        u32     rcwsr[16];      /* 0x.0100 - Reset Control Word Status registers
                                              There are 16 registers */
         u8      res140[0x224 - 0x140];
-        __be32  iodelay1;       /* 0x.0224 - IO delay control register 1 */
-        __be32  iodelay2;       /* 0x.0228 - IO delay control register 2 */
+        u32     iodelay1;       /* 0x.0224 - IO delay control register 1 */
+        u32     iodelay2;       /* 0x.0228 - IO delay control register 2 */
         u8      res22c[0x604 - 0x22c];
-        __be32  pamubypenr;     /* 0x.604 - PAMU bypass enable register */
+        u32     pamubypenr;     /* 0x.604 - PAMU bypass enable register */
         u8      res608[0x800 - 0x608];
-        __be32  clkdvdr;        /* 0x.0800 - Clock Divide Register */
+        u32     clkdvdr;        /* 0x.0800 - Clock Divide Register */
         u8      res804[0x900 - 0x804];
-        __be32  ircr;           /* 0x.0900 - Infrared Control Register */
+        u32     ircr;           /* 0x.0900 - Infrared Control Register */
         u8      res904[0x908 - 0x904];
-        __be32  dmacr;          /* 0x.0908 - DMA Control Register */
+        u32     dmacr;          /* 0x.0908 - DMA Control Register */
         u8      res90c[0x914 - 0x90c];
-        __be32  elbccr;         /* 0x.0914 - eLBC Control Register */
+        u32     elbccr;         /* 0x.0914 - eLBC Control Register */
         u8      res918[0xb20 - 0x918];
-        __be32  ddr1clkdr;      /* 0x.0b20 - DDR1 Clock Disable Register */
-        __be32  ddr2clkdr;      /* 0x.0b24 - DDR2 Clock Disable Register */
-        __be32  ddrclkdr;       /* 0x.0b28 - DDR Clock Disable Register */
+        u32     ddr1clkdr;      /* 0x.0b20 - DDR1 Clock Disable Register */
+        u32     ddr2clkdr;      /* 0x.0b24 - DDR2 Clock Disable Register */
+        u32     ddrclkdr;       /* 0x.0b28 - DDR Clock Disable Register */
         u8      resb2c[0xe00 - 0xb2c];
-        __be32  clkocr;         /* 0x.0e00 - Clock Out Select Register */
+        u32     clkocr;         /* 0x.0e00 - Clock Out Select Register */
         u8      rese04[0xe10 - 0xe04];
-        __be32  ddrdllcr;       /* 0x.0e10 - DDR DLL Control Register */
+        u32     ddrdllcr;       /* 0x.0e10 - DDR DLL Control Register */
         u8      rese14[0xe20 - 0xe14];
-        __be32  lbcdllcr;       /* 0x.0e20 - LBC DLL Control Register */
-        __be32  cpfor;          /* 0x.0e24 - L2 charge pump fuse override register */
+        u32     lbcdllcr;       /* 0x.0e20 - LBC DLL Control Register */
+        u32     cpfor;          /* 0x.0e24 - L2 charge pump fuse override
+                                 *           register
+                                 */
         u8      rese28[0xf04 - 0xe28];
-        __be32  srds1cr0;       /* 0x.0f04 - SerDes1 Control Register 0 */
-        __be32  srds1cr1;       /* 0x.0f08 - SerDes1 Control Register 0 */
+        u32     srds1cr0;       /* 0x.0f04 - SerDes1 Control Register 0 */
+        u32     srds1cr1;       /* 0x.0f08 - SerDes1 Control Register 0 */
         u8      resf0c[0xf2c - 0xf0c];
-        __be32  itcr;           /* 0x.0f2c - Internal transaction control register */
+        u32     itcr;           /* 0x.0f2c - Internal transaction control
+                                 *           register
+                                 */
         u8      resf30[0xf40 - 0xf30];
-        __be32  srds2cr0;       /* 0x.0f40 - SerDes2 Control Register 0 */
-        __be32  srds2cr1;       /* 0x.0f44 - SerDes2 Control Register 0 */
+        u32     srds2cr0;       /* 0x.0f40 - SerDes2 Control Register 0 */
+        u32     srds2cr1;       /* 0x.0f44 - SerDes2 Control Register 0 */
 } __attribute__ ((packed));
 
+u32 fsl_guts_get_svr(void);
 
 /* Alternate function signal multiplex control */
 #define MPC85xx_PMUXCR_QE(x) (0x8000 >> (x))
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 7a26286db895..fba44abd05ba 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -100,6 +100,11 @@
 #define TMIO_MMC_SDIO_STATUS_QUIRK      (1 << 8)
 
 /*
+ * Some controllers have a 32-bit wide data port register
+ */
+#define TMIO_MMC_32BIT_DATA_PORT        (1 << 9)
+
+/*
  * Some controllers allows to set SDx actual clock
  */
 #define TMIO_MMC_CLK_ACTUAL             (1 << 10)
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 73fad83acbcb..95d69d498296 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -89,6 +89,8 @@ struct mmc_ext_csd {
         unsigned int            boot_ro_lock;           /* ro lock support */
         bool                    boot_ro_lockable;
         bool                    ffu_capable;    /* Firmware upgrade support */
+        bool                    cmdq_support;   /* Command Queue supported */
+        unsigned int            cmdq_depth;     /* Command Queue depth */
 #define MMC_FIRMWARE_LEN 8
         u8                      fwrev[MMC_FIRMWARE_LEN];  /* FW version */
         u8                      raw_exception_status;   /* 54 */
@@ -207,18 +209,6 @@ struct sdio_func_tuple;
 
 #define SDIO_MAX_FUNCS          7
 
-enum mmc_blk_status {
-        MMC_BLK_SUCCESS = 0,
-        MMC_BLK_PARTIAL,
-        MMC_BLK_CMD_ERR,
-        MMC_BLK_RETRY,
-        MMC_BLK_ABORT,
-        MMC_BLK_DATA_ERR,
-        MMC_BLK_ECC_ERR,
-        MMC_BLK_NOMEDIUM,
-        MMC_BLK_NEW_REQUEST,
-};
-
 /* The number of MMC physical partitions.  These consist of:
  * boot partitions (2), general purpose partitions (4) and
  * RPMB partition (1) in MMC v4.4.
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 2b953eb8ceae..e33cc748dcfe 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -15,6 +15,18 @@ struct request;
 struct mmc_data;
 struct mmc_request;
 
+enum mmc_blk_status {
+        MMC_BLK_SUCCESS = 0,
+        MMC_BLK_PARTIAL,
+        MMC_BLK_CMD_ERR,
+        MMC_BLK_RETRY,
+        MMC_BLK_ABORT,
+        MMC_BLK_DATA_ERR,
+        MMC_BLK_ECC_ERR,
+        MMC_BLK_NOMEDIUM,
+        MMC_BLK_NEW_REQUEST,
+};
+
 struct mmc_command {
         u32                     opcode;
         u32                     arg;
@@ -150,7 +162,8 @@ 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 *);
+                                           struct mmc_async_req *,
+                                           enum mmc_blk_status *);
 extern int mmc_interrupt_hpi(struct mmc_card *);
 extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
 extern void mmc_wait_for_req_done(struct mmc_host *host,
@@ -163,6 +176,7 @@ extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
 extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);
 extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);
 extern int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error);
+extern int mmc_abort_tuning(struct mmc_host *host, u32 opcode);
 extern int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);
 
 #define MMC_ERASE_ARG           0x00000000
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index f5af2bd35e7f..15db6f83f53f 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -39,6 +39,12 @@ enum {
         EVENT_DATA_ERROR,
 };
 
+enum dw_mci_cookie {
+        COOKIE_UNMAPPED,
+        COOKIE_PRE_MAPPED,      /* mapped by pre_req() of dwmmc */
+        COOKIE_MAPPED,          /* mapped by prepare_data() of dwmmc */
+};
+
 struct mmc_data;
 
 enum {
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 0b2439441cc8..8bc884121465 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -93,8 +93,7 @@ struct mmc_host_ops {
          */
         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    (*pre_req)(struct mmc_host *host, struct mmc_request *req);
         void    (*request)(struct mmc_host *host, struct mmc_request *req);
 
         /*
@@ -173,7 +172,7 @@ struct mmc_async_req {
          * Check error status of completed mmc request.
          * Returns 0 if success otherwise non zero.
          */
-        int (*err_check) (struct mmc_card *, struct mmc_async_req *);
+        enum mmc_blk_status (*err_check)(struct mmc_card *, struct mmc_async_req *);
 };
 
 /**
@@ -198,14 +197,12 @@ struct mmc_slot {
  * @is_new_req          wake up reason was new request
  * @is_waiting_last_req mmc context waiting for single running request
  * @wait                wait queue
- * @lock                lock to protect data fields
  */
 struct mmc_context_info {
         bool                    is_done_rcv;
         bool                    is_new_req;
         bool                    is_waiting_last_req;
         wait_queue_head_t       wait;
-        spinlock_t              lock;
 };
 
 struct regulator;
@@ -495,11 +492,6 @@ static inline int mmc_host_uhs(struct mmc_host *host)
                  MMC_CAP_UHS_DDR50);
 }
 
-static inline int mmc_host_packed_wr(struct mmc_host *host)
-{
-        return host->caps2 & MMC_CAP2_PACKED_WR;
-}
-
 static inline int mmc_card_hs(struct mmc_card *card)
 {
         return card->host->ios.timing == MMC_TIMING_SD_HS ||
@@ -546,6 +538,11 @@ static inline void mmc_retune_recheck(struct mmc_host *host)
                 host->retune_now = 1;
 }
 
+static inline bool mmc_can_retune(struct mmc_host *host)
+{
+        return host->can_retune == 1;
+}
+
 void mmc_retune_pause(struct mmc_host *host);
 void mmc_retune_unpause(struct mmc_host *host);
 
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index c376209c70ef..672730acc705 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -84,6 +84,13 @@
 #define MMC_APP_CMD              55   /* ac   [31:16] RCA        R1  */
 #define MMC_GEN_CMD              56   /* adtc [0] RD/WR          R1  */
 
+  /* class 11 */
+#define MMC_QUE_TASK_PARAMS      44   /* ac   [20:16] task id    R1  */
+#define MMC_QUE_TASK_ADDR        45   /* ac   [31:0] data addr   R1  */
+#define MMC_EXECUTE_READ_TASK    46   /* adtc [20:16] task id    R1  */
+#define MMC_EXECUTE_WRITE_TASK   47   /* adtc [20:16] task id    R1  */
+#define MMC_CMDQ_TASK_MGMT       48   /* ac   [20:16] task id    R1b */
+
 static inline bool mmc_op_multi(u32 opcode)
 {
         return opcode == MMC_WRITE_MULTIPLE_BLOCK ||
@@ -272,6 +279,7 @@ struct _mmc_csd {
  * EXT_CSD fields
  */
 
+#define EXT_CSD_CMDQ_MODE_EN            15      /* R/W */
 #define EXT_CSD_FLUSH_CACHE             32      /* W */
 #define EXT_CSD_CACHE_CTRL              33      /* R/W */
 #define EXT_CSD_POWER_OFF_NOTIFICATION  34      /* R/W */
@@ -331,6 +339,8 @@ struct _mmc_csd {
 #define EXT_CSD_CACHE_SIZE              249     /* RO, 4 bytes */
 #define EXT_CSD_PWR_CL_DDR_200_360      253     /* RO */
 #define EXT_CSD_FIRMWARE_VERSION        254     /* RO, 8 bytes */
+#define EXT_CSD_CMDQ_DEPTH              307     /* RO */
+#define EXT_CSD_CMDQ_SUPPORT            308     /* RO */
 #define EXT_CSD_SUPPORTED_MODE          493     /* RO */
 #define EXT_CSD_TAG_UNIT_SIZE           498     /* RO */
 #define EXT_CSD_DATA_TAG_SUPPORT        499     /* RO */
@@ -438,6 +448,13 @@ struct _mmc_csd {
 #define EXT_CSD_MANUAL_BKOPS_MASK       0x01
 
 /*
+ * Command Queue
+ */
+#define EXT_CSD_CMDQ_MODE_ENABLED       BIT(0)
+#define EXT_CSD_CMDQ_DEPTH_MASK         GENMASK(4, 0)
+#define EXT_CSD_CMDQ_SUPPORTED          BIT(0)
+
+/*
  * MMC_SWITCH access modes
  */
 
diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h
index 3945a8c9d3cb..a7972cd3bc14 100644
--- a/include/linux/mmc/slot-gpio.h
+++ b/include/linux/mmc/slot-gpio.h
@@ -29,5 +29,6 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id,
 void mmc_gpio_set_cd_isr(struct mmc_host *host,
                          irqreturn_t (*isr)(int irq, void *dev_id));
 void mmc_gpiod_request_cd_irq(struct mmc_host *host);
+bool mmc_can_gpio_cd(struct mmc_host *host);
 
 #endif
diff --git a/include/linux/sys_soc.h b/include/linux/sys_soc.h
index 2739ccb69571..bed223b70217 100644
--- a/include/linux/sys_soc.h
+++ b/include/linux/sys_soc.h
@@ -13,6 +13,7 @@ struct soc_device_attribute {
         const char *family;
         const char *revision;
         const char *soc_id;
+        const void *data;
 };
 
 /**
@@ -34,4 +35,12 @@ void soc_device_unregister(struct soc_device *soc_dev);
  */
 struct device *soc_device_to_device(struct soc_device *soc);
 
+#ifdef CONFIG_SOC_BUS
+const struct soc_device_attribute *soc_device_match(
+        const struct soc_device_attribute *matches);
+#else
+static inline const struct soc_device_attribute *soc_device_match(
+        const struct soc_device_attribute *matches) { return NULL; }
+#endif
+
 #endif /* __SOC_BUS_H */
diff --git a/include/uapi/linux/mmc/ioctl.h b/include/uapi/linux/mmc/ioctl.h
index 7e385b83b9d8..700a55156eee 100644
--- a/include/uapi/linux/mmc/ioctl.h
+++ b/include/uapi/linux/mmc/ioctl.h
@@ -69,6 +69,6 @@ struct mmc_ioc_multi_cmd {
  * is enforced per ioctl call.  For larger data transfers, use the normal
  * block device operations.
  */
-#define MMC_IOC_MAX_BYTES  (512L * 256)
+#define MMC_IOC_MAX_BYTES  (512L * 1024)
 #define MMC_IOC_MAX_CMDS    255
 #endif /* LINUX_MMC_IOCTL_H */