diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-23 15:14:17 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-23 15:14:17 +0200 |
| commit | 0ca11639f8fa3e72e7635fc679ef34116013cc97 (patch) | |
| tree | 08c3bd0ea8e652dda8dc631d9b203eae08ac6206 /include | |
| parent | 66a189d390e253fee3274fa3481b76785dcd97ab (diff) | |
| parent | c98cbf6ce8b9f9f535600b15a5f34a77982b226b (diff) | |
| download | linux-next-0ca11639f8fa3e72e7635fc679ef34116013cc97.tar.gz linux-next-0ca11639f8fa3e72e7635fc679ef34116013cc97.zip | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/host.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index ba84f02c2a10..198554e48346 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -23,6 +23,7 @@ struct mmc_ios { unsigned int clock; /* clock rate */ unsigned short vdd; unsigned int power_delay_ms; /* waiting for stable power */ + unsigned int power_off_delay_us; /* waiting for power discharge */ /* vdd stores the bit number of the selected voltage range from below. */ @@ -463,6 +464,7 @@ struct mmc_host { #define MMC_CAP2_CRYPTO 0 #endif #define MMC_CAP2_ALT_GPT_TEGRA (1 << 28) /* Host with eMMC that has GPT entry at a non-standard location */ +#define MMC_CAP2_CRYPTO_NO_REPROG (1 << 29) /* Host handles inline crypto key reprogramming */ bool uhs2_sd_tran; /* UHS-II flag for SD_TRAN state */ bool uhs2_app_cmd; /* UHS-II flag for APP command */ @@ -583,11 +585,9 @@ struct mmc_host { struct device_node; -struct mmc_host *mmc_alloc_host(int extra, struct device *); struct mmc_host *devm_mmc_alloc_host(struct device *dev, int extra); int mmc_add_host(struct mmc_host *); void mmc_remove_host(struct mmc_host *); -void mmc_free_host(struct mmc_host *); void mmc_of_parse_clk_phase(struct device *dev, struct mmc_clk_phase_map *map); int mmc_of_parse(struct mmc_host *host); |