From: Adrian Hunter Date: Tue, 4 Nov 2014 10:42:40 +0000 (+0200) Subject: mmc: sdhci: Add sdhci_adma_mark_end() X-Git-Tag: MMI-PSA29.97-13-9~11089^2~64 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b5ffa6749c596234243731e458739a2d793fb944;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git mmc: sdhci: Add sdhci_adma_mark_end() In preparation for 64-bit ADMA, separate out code that touches the ADMA descriptor by adding sdhci_adma_mark_end(). Signed-off-by: Adrian Hunter Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f2062b073e00..19f31ea99738 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -468,6 +468,13 @@ static void sdhci_adma_write_desc(u8 *desc, u32 addr, int len, unsigned cmd) dataddr[0] = cpu_to_le32(addr); } +static void sdhci_adma_mark_end(void *desc) +{ + u8 *dma_desc = desc; + + dma_desc[0] |= 0x2; /* end */ +} + static int sdhci_adma_table_pre(struct sdhci_host *host, struct mmc_data *data) { @@ -564,7 +571,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, */ if (desc != host->adma_table) { desc -= 8; - desc[0] |= 0x2; /* end */ + sdhci_adma_mark_end(desc); } } else { /*