* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: mmc: core: Fix deadlock when the CONFIG_MMC_UNSAFE_RESUME is not defined mmc: sdhci-s3c: Remove old and misprototyped suspend operations mmc: tmio: fix clock gating on platforms with a .set_pwr() method mmc: sh_mmcif: fix clock gating on platforms with a .down_pwr() method mmc: core: Fix typo at mmc_card_sleep mmc: core: Fix power_off_notify during suspend mmc: core: Fix setting power notify state variable for non-eMMC mmc: core: Add quirk for long data read time mmc: Add module.h include to sdhci-cns3xxx.c mmc: mxcmmc: fix falling back to PIO mmc: omap_hsmmc: DMA unmap only once in case of MMC error
Showing the changes to include/linux (1 of 10 files). Show all
Unified · Split
| @@ -218,6 +218,7 @@ struct mmc_card { · 217 unmodified lines | ||
| 218 | 218 | #define MMC_QUIRK_INAND_CMD38 (1<<6) /* iNAND devices have broken CMD38 */ |
| 219 | 219 | #define MMC_QUIRK_BLK_NO_CMD23 (1<<7) /* Avoid CMD23 for regular multiblock */ |
| 220 | 220 | #define MMC_QUIRK_BROKEN_BYTE_MODE_512 (1<<8) /* Avoid sending 512 bytes in */ |
| 221 | +#define MMC_QUIRK_LONG_READ_TIME (1<<9) /* Data read time > CSD says */ | |
| 221 | 222 | /* byte mode */ |
| 222 | 223 | unsigned int poweroff_notify_state; /* eMMC4.5 notify feature */ |
| 223 | 224 | #define MMC_NO_POWER_NOTIFICATION 0 |
| @@ -433,6 +434,11 @@ static inline int mmc_card_broken_byte_mode_512(const struct mmc_card *c) · 209 unmodified lines | ||
| 433 | 434 | return c->quirks & MMC_QUIRK_BROKEN_BYTE_MODE_512; |
| 434 | 435 | } |
| 435 | 436 | |
| 437 | +static inline int mmc_card_long_read_time(const struct mmc_card *c) | |
| 438 | +{ | |
| 439 | + return c->quirks & MMC_QUIRK_LONG_READ_TIME; | |
| 440 | +} | |
| 441 | + | |
| 436 | 442 | #define mmc_card_name(c) ((c)->cid.prod_name) |
| 437 | 443 | #define mmc_card_id(c) (dev_name(&(c)->dev)) |
| 438 | 444 | |