diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-21 15:48:02 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-21 15:48:02 (GMT) |
| commit | f85fad024f208ceedb3ce0bb1819936e62a0983e (patch) | |
| tree | f9c059cce2ca7ea0fdc74e16b76a6ec7ad3e1108 /include | |
| parent | a2ed3f452dd1cf4982fe46d5111d200909786686 (diff) | |
| parent | 2b42903397b4d6b68fe2af95565a8953b08ab96e (diff) | |
| download | u-boot-fsl-qoriq-f85fad024f208ceedb3ce0bb1819936e62a0983e.tar.xz | |
Merge branch 'master' of http://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/mmc.h | 9 | ||||
| -rw-r--r-- | include/sdhci.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/mmc.h b/include/mmc.h index aa6d5d1..e815eb3 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -11,6 +11,7 @@ #define _MMC_H_ #include <linux/list.h> +#include <linux/sizes.h> #include <linux/compiler.h> #include <part.h> @@ -102,6 +103,7 @@ #define SD_CMD_SWITCH_UHS18V 11 #define SD_CMD_APP_SET_BUS_WIDTH 6 +#define SD_CMD_APP_SD_STATUS 13 #define SD_CMD_ERASE_WR_BLK_START 32 #define SD_CMD_ERASE_WR_BLK_END 33 #define SD_CMD_APP_SEND_OP_COND 41 @@ -392,6 +394,12 @@ struct mmc_config { unsigned char part_type; }; +struct sd_ssr { + unsigned int au; /* In sectors */ + unsigned int erase_timeout; /* In milliseconds */ + unsigned int erase_offset; /* In milliseconds */ +}; + /* * With CONFIG_DM_MMC enabled, struct mmc can be accessed from the MMC device * with mmc_get_mmc_dev(). @@ -426,6 +434,7 @@ struct mmc { uint write_bl_len; uint erase_grp_size; /* in 512-byte sectors */ uint hc_wp_grp_size; /* in 512-byte sectors */ + struct sd_ssr ssr; /* SD status register */ u64 capacity; u64 capacity_user; u64 capacity_boot; diff --git a/include/sdhci.h b/include/sdhci.h index 6844c73..144570f 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -97,6 +97,7 @@ #define SDHCI_DIV_MASK 0xFF #define SDHCI_DIV_MASK_LEN 8 #define SDHCI_DIV_HI_MASK 0x300 +#define SDHCI_PROG_CLOCK_MODE 0x0020 #define SDHCI_CLOCK_CARD_EN 0x0004 #define SDHCI_CLOCK_INT_STABLE 0x0002 #define SDHCI_CLOCK_INT_EN 0x0001 @@ -242,6 +243,7 @@ struct sdhci_host { unsigned int quirks; unsigned int host_caps; unsigned int version; + unsigned int clk_mul; /* Clock Multiplier value */ unsigned int clock; struct mmc *mmc; const struct sdhci_ops *ops; |