aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-05-05 23:25:35 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-05-12 20:05:51 -0400
commitb60188c820347040087bfe329f77b286dfd50a7e (patch)
tree0bc43d1528d486506d2d4c021a69da39006436bc /drivers/mmc/host
parentdf06bfc724b58d649eef4bf51a953c7aeed9635f (diff)
mmc: mxs-mmc: have dma_channel than dma_res in mxs_mmc_host
It replaces dma_res with dma_channel in struct mxs_mmc_host, so that the device tree support will be a little easier, since dma channel can not be retrieved from "struct resource *dma_res". Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r--drivers/mmc/host/mxs-mmc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index d2729e117ae1..202d0966b673 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -146,7 +146,7 @@ struct mxs_mmc_host {
146 struct mmc_data *data; 146 struct mmc_data *data;
147 147
148 void __iomem *base; 148 void __iomem *base;
149 struct resource *dma_res; 149 int dma_channel;
150 struct clk *clk; 150 struct clk *clk;
151 unsigned int clk_rate; 151 unsigned int clk_rate;
152 152
@@ -668,7 +668,7 @@ static bool mxs_mmc_dma_filter(struct dma_chan *chan, void *param)
668 if (!mxs_dma_is_apbh(chan)) 668 if (!mxs_dma_is_apbh(chan))
669 return false; 669 return false;
670 670
671 if (chan->chan_id != host->dma_res->start) 671 if (chan->chan_id != host->dma_channel)
672 return false; 672 return false;
673 673
674 chan->private = &host->dma_data; 674 chan->private = &host->dma_data;
@@ -719,7 +719,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
719 719
720 host->devid = pdev->id_entry->driver_data; 720 host->devid = pdev->id_entry->driver_data;
721 host->mmc = mmc; 721 host->mmc = mmc;
722 host->dma_res = dmares; 722 host->dma_channel = dmares->start;
723 host->sdio_irq_en = 0; 723 host->sdio_irq_en = 0;
724 724
725 pinctrl = devm_pinctrl_get_select_default(&pdev->dev); 725 pinctrl = devm_pinctrl_get_select_default(&pdev->dev);