mmc: mmci: add dma_finalize callback

This patch adds dma_finalize callback at mmci_host_ops
to allow to call specific variant.

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 72584f4aa70805ad9b57271c29d9bb4c6c19b758..4570042319e9c2cd3b9029cc0aaeb256fd098ff1 100644 (file)
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -460,6 +460,15 @@ int mmci_dma_start(struct mmci_host *host, unsigned int datactrl)
        return 0;
 }
 
+void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data)
+{
+       if (!host->use_dma)
+               return;
+
+       if (host->ops && host->ops->dma_finalize)
+               host->ops->dma_finalize(host, data);
+}
+
 static void
 mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
 {
@@ -641,13 +650,13 @@ static void mmci_dma_data_error(struct mmci_host *host)
        mmci_dma_unmap(host, host->data);
 }
 
-static void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data)
+void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data)
 {
        struct mmci_dmae_priv *dmae = host->dma_priv;
        u32 status;
        int i;
 
-       if (!host->use_dma || !dma_inprogress(host))
+       if (!dma_inprogress(host))
                return;
 
        /* Wait up to 1ms for the DMA to complete */
@@ -844,6 +853,7 @@ static struct mmci_host_ops mmci_variant_ops = {
        .dma_setup = mmci_dmae_setup,
        .dma_release = mmci_dmae_release,
        .dma_start = mmci_dmae_start,
+       .dma_finalize = mmci_dmae_finalize,
 };
 
 void mmci_variant_init(struct mmci_host *host)
@@ -852,11 +862,6 @@ void mmci_variant_init(struct mmci_host *host)
 }
 #else
 /* Blank functions if the DMA engine is not available */
-static inline void mmci_dma_finalize(struct mmci_host *host,
-                                    struct mmc_data *data)
-{
-}
-
 static inline void mmci_dma_data_error(struct mmci_host *host)
 {
 }

diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 7bca597ee76fe65ead24a830f51e538d9ef8adcf..8c1493be3cf9e147b0c1b1d0dd448aea34461421 100644 (file)
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -281,6 +281,7 @@ struct mmci_host_ops {
        int (*dma_setup)(struct mmci_host *host);
        void (*dma_release)(struct mmci_host *host);
        int (*dma_start)(struct mmci_host *host, unsigned int *datactrl);
+       void (*dma_finalize)(struct mmci_host *host, struct mmc_data *data);
 };
 
 struct mmci_host {
@@ -341,4 +342,4 @@ void mmci_dmae_get_next_data(struct mmci_host *host, struct mmc_data *data);
 int mmci_dmae_setup(struct mmci_host *host);
 void mmci_dmae_release(struct mmci_host *host);
 int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl);
-
+void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data);

diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c
index 66af40660f51ddeaf103a5bc016929d52d514bdf..c2ef73f5f0a7ebe8723da1e8d65be0de52fe45dd 100644 (file)
--- a/drivers/mmc/host/mmci_qcom_dml.c
+++ b/drivers/mmc/host/mmci_qcom_dml.c
@@ -190,6 +190,7 @@ static struct mmci_host_ops qcom_variant_ops = {
        .dma_setup = qcom_dma_setup,
        .dma_release = mmci_dmae_release,
        .dma_start = mmci_dmae_start,
+       .dma_finalize = mmci_dmae_finalize,
 };
 
 void qcom_variant_init(struct mmci_host *host)