diff options
| author | Adrian Hunter | 2014-11-04 11:42:42 +0100 |
|---|---|---|
| committer | Ulf Hansson | 2014-11-10 12:40:51 +0100 |
| commit | 76fe379acaeb857f91705f3bd5c6f69ec13872a9 (patch) | |
| tree | 96a20d4da17bfc7497a617c0f459ba42fd59697d /include/linux/mmc | |
| parent | mmc: sdhci: Use 'void *' for not 'u8 *' for ADMA data (diff) | |
| download | kernel-qcow2-linux-76fe379acaeb857f91705f3bd5c6f69ec13872a9.tar.gz kernel-qcow2-linux-76fe379acaeb857f91705f3bd5c6f69ec13872a9.tar.xz kernel-qcow2-linux-76fe379acaeb857f91705f3bd5c6f69ec13872a9.zip | |
mmc: sdhci: Parameterize ADMA sizes and alignment
In preparation for 64-bit ADMA, parameterize ADMA sizes
and alignment. 64-bit ADMA has a larger descriptor
because it contains a 64-bit address instead of a 32-bit
address. Also data must be 8-byte aligned instead
of 4-byte aligned. Consequently, sdhci_host members
are added for descriptor, table, and buffer sizes
and alignment.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'include/linux/mmc')
| -rw-r--r-- | include/linux/mmc/sdhci.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index 933dbbb50742..2a72e9510833 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -158,9 +158,16 @@ struct sdhci_host { void *adma_table; /* ADMA descriptor table */ void *align_buffer; /* Bounce buffer */ + size_t adma_table_sz; /* ADMA descriptor table size */ + size_t align_buffer_sz; /* Bounce buffer size */ + dma_addr_t adma_addr; /* Mapped ADMA descr. table */ dma_addr_t align_addr; /* Mapped bounce buffer */ + unsigned int desc_sz; /* ADMA descriptor size */ + unsigned int align_sz; /* ADMA alignment */ + unsigned int align_mask; /* ADMA alignment mask */ + struct tasklet_struct finish_tasklet; /* Tasklet structures */ struct timer_list timer; /* Timer for timeouts */ |