diff options
| author | Subhash Jadavani <subhashj@codeaurora.org> | 2016-06-02 17:16:15 -0700 |
|---|---|---|
| committer | Subhash Jadavani <subhashj@codeaurora.org> | 2016-06-02 17:18:27 -0700 |
| commit | 5f66586fecacdda9e24bfc8d8a5abe08da9508b4 (patch) | |
| tree | 935924b3ae3e89dc5e6fa118c870b010bde0fb98 /include/uapi | |
| parent | 9f3090c43d8f662446766e81c4bb78a937fba447 (diff) | |
| parent | 2c1f2ce7a87b5c09f7a23d86b6d87bb42a9b2384 (diff) | |
Merge branch 'dev/msm-4.4-mmc_port' into msm-4.4
This merge brings MMC/SD card changes from 'dev/msm-4.4-mmc_port' to
msm-4.4.
* origin/dev/msm-4.4-mmc_port: (472 commits)
mmc: sdhci-msm: fix few compilation issues
mmc: cmdq_hci: fix compilation issue
mmc: host: fix compilation issue when clk_gating config is disabled
mmc: sdhci: clean up legacy adma related variables
mmc: sdhci: enable 64-bit DMA support only if chipset supports 64-bit
mmc: sdhci: Replace SDHCI_USE_ADMA_64BIT flag
mmc: auto bkops fixes
mmc: card: fix quirk bit map
Revert "mmc: core: get drive types supported by eMMC cards"
mmc: host: sdhci: don't queue zero length descriptor
mmc: core: fix deadlock between runtime-suspend and devfreq
mmc: block: Add quirk and increase read data timeout for hynix emmc
mmc: card: Fix broken clock gating
mmc: core: postpone runtime suspend in case BKOPS is required
mmc: core: update AUTO_EN in BKOPS_EN field on runtime resume
mmc: revert runtime idle state
mmc: host: Set max frequency when disabling clock scaling
mmc: queue: Fix queue_lock spinlock bug from CMDQ shutdown path
mmc: core: fix issue with devfreq clock scaling
mmc: core: set REL_WR_SEC_C register to 0x1 per eMMC5.0 spec
...
Change-Id: I702a72fbbecba520f429bf1149106e684335e2a5
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/mmc/Kbuild | 2 | ||||
| -rw-r--r-- | include/uapi/linux/mmc/mmc.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild index b250482ea78a..ce4e88593605 100644 --- a/include/uapi/linux/mmc/Kbuild +++ b/include/uapi/linux/mmc/Kbuild @@ -1,4 +1,6 @@ # UAPI Header export list header-y += core.h +header-y += core.h header-y += ioctl.h header-y += mmc.h +header-y += mmc.h diff --git a/include/uapi/linux/mmc/mmc.h b/include/uapi/linux/mmc/mmc.h index f75ae945c0c5..dd9f3a644169 100644 --- a/include/uapi/linux/mmc/mmc.h +++ b/include/uapi/linux/mmc/mmc.h @@ -29,6 +29,7 @@ #define MMC_READ_MULTIPLE_BLOCK 18 /* adtc [31:0] data addr R1 */ #define MMC_SEND_TUNING_BLOCK 19 /* adtc R1 */ #define MMC_SEND_TUNING_BLOCK_HS200 21 /* adtc R1 */ +#define MMC_SEND_TUNING_BLOCK_HS400 MMC_SEND_TUNING_BLOCK_HS200 #define MMC_TUNING_BLK_PATTERN_4BIT_SIZE 64 #define MMC_TUNING_BLK_PATTERN_8BIT_SIZE 128 |