mmc: Introduce mmc_phys_to_bus()/mmc_bus_to_phys()

This will allow us to use DM variants of phys_to_bus()/bus_to_phys()
when relevant.

Change-Id: I09330b798d379fbf1045017fac87dfc7507ebdbb
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 05cb7ee40b762f9f6f979fa70bd561cef7e3c261..cb8fa5b8ba73ed1b3df0adc5c2d5d6cbed194c10 100644 (file)
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -16,7 +16,6 @@
 #include <sdhci.h>
 #include <dm.h>
 #include <linux/dma-mapping.h>
-#include <phys2bus.h>
 
 static void sdhci_reset(struct sdhci_host *host, u8 mask)
 {
@@ -121,6 +120,7 @@ static void sdhci_prepare_adma_table(struct sdhci_host *host,
 static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data,
                              int *is_aligned, int trans_bytes)
 {
+       dma_addr_t dma_addr;
        unsigned char ctrl;
        void *buf;
 
@@ -151,10 +151,13 @@ static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data,
                                          mmc_get_dma_dir(data));
 
        if (host->flags & USE_SDMA) {
-               sdhci_writel(host, phys_to_bus((ulong)host->start_addr),
-                               SDHCI_DMA_ADDRESS);
-       } else if (host->flags & (USE_ADMA | USE_ADMA64)) {
-               sdhci_prepare_adma_table(host, data);
+               dma_addr = dev_phys_to_bus(mmc_to_dev(host->mmc), host->start_addr);
+               sdhci_writel(host, dma_addr, SDHCI_DMA_ADDRESS);
+       }
+#if CONFIG_IS_ENABLED(MMC_SDHCI_ADMA)
+       else if (host->flags & (USE_ADMA | USE_ADMA64)) {
+               sdhci_prepare_adma_table(host->adma_desc_table, data,
+                                        host->start_addr);
 
                sdhci_writel(host, lower_32_bits(host->adma_addr),
                             SDHCI_ADMA_ADDRESS);
@@ -162,6 +165,7 @@ static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data,
                        sdhci_writel(host, upper_32_bits(host->adma_addr),
                                     SDHCI_ADMA_ADDRESS_HI);
        }
+#endif
 }
 #else
 static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data,
@@ -206,8 +210,9 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data)
                                start_addr &=
                                ~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1);
                                start_addr += SDHCI_DEFAULT_BOUNDARY_SIZE;
-                               sdhci_writel(host, phys_to_bus((ulong)start_addr),
-                                            SDHCI_DMA_ADDRESS);
+                               start_addr = dev_phys_to_bus(mmc_to_dev(host->mmc),
+                                                            start_addr);
+                               sdhci_writel(host, start_addr, SDHCI_DMA_ADDRESS);
                        }
                }
                if (timeout-- > 0)

diff --git a/include/mmc.h b/include/mmc.h
index d16fc14fb6b49cc3da85d65ab8c130ac007860a8..dab069ea868963893c004ccfb0af7d4a6ae50702 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -653,6 +653,12 @@ struct mmc {
        u32 quirks;
 };
 
+#if CONFIG_IS_ENABLED(DM_MMC)
+#define mmc_to_dev(_mmc)       _mmc->dev
+#else
+#define mmc_to_dev(_mmc)       NULL
+#endif
+
 struct mmc_hwpart_conf {
        struct {
                uint enh_start; /* in 512-byte sectors */