Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
mmc: Merge branch fixes into next
Merge the mmc fixes for v7.0-rc[n] into the next branch, to allow them to
get tested together with the mmc changes that are targeted for the next
release.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+5
-4
+5
-4
include/linux/mmc/host.h
+5
-4
include/linux/mmc/host.h
···
486
486
487
487
struct mmc_ios ios; /* current io bus settings */
488
488
489
+
bool claimed; /* host exclusively claimed */
490
+
489
491
/* group bitfields together to minimize padding */
490
492
unsigned int use_spi_crc:1;
491
-
unsigned int claimed:1; /* host exclusively claimed */
492
493
unsigned int doing_init_tune:1; /* initial tuning in progress */
493
-
unsigned int can_retune:1; /* re-tuning can be used */
494
494
unsigned int doing_retune:1; /* re-tuning in progress */
495
-
unsigned int retune_now:1; /* do re-tuning at next req */
496
-
unsigned int retune_paused:1; /* re-tuning is temporarily disabled */
497
495
unsigned int retune_crc_disable:1; /* don't trigger retune upon crc */
498
496
unsigned int can_dma_map_merge:1; /* merging can be used */
499
497
unsigned int vqmmc_enabled:1; /* vqmmc regulator is enabled */
···
506
508
int rescan_disable; /* disable card detection */
507
509
int rescan_entered; /* used with nonremovable devices */
508
510
511
+
bool can_retune; /* re-tuning can be used */
512
+
bool retune_now; /* do re-tuning at next req */
513
+
bool retune_paused; /* re-tuning is temporarily disabled */
509
514
int need_retune; /* re-tuning is needed */
510
515
int hold_retune; /* hold off re-tuning */
511
516
unsigned int retune_period; /* re-tuning period in secs */