Commit 92197498 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  s3cmci: Add Ben Dooks/Simtec Electronics to header & copyright
  s3cmci: fix continual accesses to host->pio_ptr
  s3cmci: Support transfers which are not multiple of 32 bits.
  s3cmci: cpufreq support
  s3cmci: Make general protocol errors less noisy
  mmc_block: tell block layer there is no seek penalty
parents 7d67474e 08c55e22
...@@ -132,6 +132,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock ...@@ -132,6 +132,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
blk_queue_prep_rq(mq->queue, mmc_prep_request); blk_queue_prep_rq(mq->queue, mmc_prep_request);
blk_queue_ordered(mq->queue, QUEUE_ORDERED_DRAIN, NULL); blk_queue_ordered(mq->queue, QUEUE_ORDERED_DRAIN, NULL);
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mq->queue);
#ifdef CONFIG_MMC_BLOCK_BOUNCE #ifdef CONFIG_MMC_BLOCK_BOUNCE
if (host->max_hw_segs == 1) { if (host->max_hw_segs == 1) {
......
This diff is collapsed.
...@@ -51,7 +51,7 @@ struct s3cmci_host { ...@@ -51,7 +51,7 @@ struct s3cmci_host {
int dma_complete; int dma_complete;
u32 pio_sgptr; u32 pio_sgptr;
u32 pio_words; u32 pio_bytes;
u32 pio_count; u32 pio_count;
u32 *pio_ptr; u32 *pio_ptr;
#define XFER_NONE 0 #define XFER_NONE 0
...@@ -67,4 +67,8 @@ struct s3cmci_host { ...@@ -67,4 +67,8 @@ struct s3cmci_host {
unsigned int ccnt, dcnt; unsigned int ccnt, dcnt;
struct tasklet_struct pio_tasklet; struct tasklet_struct pio_tasklet;
#ifdef CONFIG_CPU_FREQ
struct notifier_block freq_transition;
#endif
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment