Merge tag 'dma-mapping-5.4' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-block.git] / include / linux / mmc / host.h

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 4704b77259ee22c68e566f64f0c3e8358d3c7eb9..ba703384bea0c8d4fa2b37717b8656f7e9a04227 100644 (file)
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -368,6 +368,7 @@ 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 */
 #define MMC_CAP2_AVOID_3_3V    (1 << 25)       /* Host must negotiate down from 3.3V */
+#define MMC_CAP2_MERGE_CAPABLE (1 << 26)       /* Host can merge a segment over the segment size */
 
        int                     fixed_drv_type; /* fixed driver type for non-removable media */
 
@@ -397,6 +398,7 @@ struct mmc_host {
        unsigned int            retune_paused:1; /* re-tuning is temporarily disabled */
        unsigned int            use_blk_mq:1;   /* use blk-mq */
        unsigned int            retune_crc_disable:1; /* don't trigger retune upon crc */
+       unsigned int            can_dma_map_merge:1; /* merging can be used */
 
        int                     rescan_disable; /* disable card detection */
        int                     rescan_entered; /* used with nonremovable devices */