| Message ID | 1366801122-13302-1-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 24, 2013 at 12:58 PM, Lee Jones <lee.jones@linaro.org> wrote: > Currently, if DMA information isn't passed from platform data, then DMA > will not be used. This patch allows DMA information obtained though Device > Tree to be used as well. > > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Chris Ball <cjb@laptop.org> > Cc: linux-mmc@vger.kernel.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> (...) I tried to test this patch, but: CC drivers/mmc/host/mmci.o /drivers/mmc/host/mmci.c: In function 'mmci_dma_setup': /drivers/mmc/host/mmci.c:307:51: error: 'dev' undeclared (first use in this function) /drivers/mmc/host/mmci.c:307:51: note: each undeclared identifier is reported only once for each function it appears in make[5]: *** [drivers/mmc/host/mmci.o] Error 1 make[4]: *** [drivers/mmc/host] Error 2 make[3]: *** [drivers/mmc] Error 2 Due to: > @@ -304,10 +304,8 @@ static void mmci_dma_setup(struct mmci_host *host) > const char *rxname, *txname; > dma_cap_mask_t mask; > > - if (!plat || !plat->dma_filter) { > - dev_info(mmc_dev(host->mmc), "no DMA platform data\n"); > - return; > - } > + host->dma_rx_channel = dma_request_slave_channel(dev, "rx"); > + host->dma_tx_channel = dma_request_slave_channel(dev, "tx"); There is no "dev" here. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 30 Apr 2013, Linus Walleij wrote: > On Wed, Apr 24, 2013 at 12:58 PM, Lee Jones <lee.jones@linaro.org> wrote: > > > Currently, if DMA information isn't passed from platform data, then DMA > > will not be used. This patch allows DMA information obtained though Device > > Tree to be used as well. > > > > Cc: Russell King <linux@arm.linux.org.uk> > > Cc: Chris Ball <cjb@laptop.org> > > Cc: linux-mmc@vger.kernel.org > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > (...) > > I tried to test this patch, but: > CC drivers/mmc/host/mmci.o > /drivers/mmc/host/mmci.c: In function 'mmci_dma_setup': > /drivers/mmc/host/mmci.c:307:51: error: 'dev' undeclared (first use in > this function) > /drivers/mmc/host/mmci.c:307:51: note: each undeclared identifier is > reported only once for each function it appears in > make[5]: *** [drivers/mmc/host/mmci.o] Error 1 > make[4]: *** [drivers/mmc/host] Error 2 > make[3]: *** [drivers/mmc] Error 2 > > Due to: > > > @@ -304,10 +304,8 @@ static void mmci_dma_setup(struct mmci_host *host) > > const char *rxname, *txname; > > dma_cap_mask_t mask; > > > > - if (!plat || !plat->dma_filter) { > > - dev_info(mmc_dev(host->mmc), "no DMA platform data\n"); > > - return; > > - } > > + host->dma_rx_channel = dma_request_slave_channel(dev, "rx"); > > + host->dma_tx_channel = dma_request_slave_channel(dev, "tx"); > > There is no "dev" here. You've missed v2 again dude.
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 372e921..ecd256b 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -304,10 +304,8 @@ static void mmci_dma_setup(struct mmci_host *host) const char *rxname, *txname; dma_cap_mask_t mask; - if (!plat || !plat->dma_filter) { - dev_info(mmc_dev(host->mmc), "no DMA platform data\n"); - return; - } + host->dma_rx_channel = dma_request_slave_channel(dev, "rx"); + host->dma_tx_channel = dma_request_slave_channel(dev, "tx"); /* initialize pre request cookie */ host->next_data.cookie = 1; @@ -316,30 +314,33 @@ static void mmci_dma_setup(struct mmci_host *host) dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); - /* - * If only an RX channel is specified, the driver will - * attempt to use it bidirectionally, however if it is - * is specified but cannot be located, DMA will be disabled. - */ - if (plat->dma_rx_param) { - host->dma_rx_channel = dma_request_channel(mask, + if (plat && plat->dma_filter) { + if (!host->dma_rx_channel && plat->dma_rx_param) { + host->dma_rx_channel = dma_request_channel(mask, plat->dma_filter, plat->dma_rx_param); - /* E.g if no DMA hardware is present */ - if (!host->dma_rx_channel) - dev_err(mmc_dev(host->mmc), "no RX DMA channel\n"); - } + /* E.g if no DMA hardware is present */ + if (!host->dma_rx_channel) + dev_err(mmc_dev(host->mmc), "no RX DMA channel\n"); + } - if (plat->dma_tx_param) { - host->dma_tx_channel = dma_request_channel(mask, + if (!host->dma_tx_channel && plat->dma_tx_param) { + host->dma_tx_channel = dma_request_channel(mask, plat->dma_filter, plat->dma_tx_param); - if (!host->dma_tx_channel) - dev_warn(mmc_dev(host->mmc), "no TX DMA channel\n"); - } else { - host->dma_tx_channel = host->dma_rx_channel; + if (!host->dma_tx_channel) + dev_warn(mmc_dev(host->mmc), "no TX DMA channel\n"); + } } + /* + * If only an RX channel is specified, the driver will + * attempt to use it bidirectionally, however if it is + * is specified but cannot be located, DMA will be disabled. + */ + if (host->dma_rx_channel && !host->dma_tx_channel) + host->dma_tx_channel = host->dma_rx_channel; + if (host->dma_rx_channel) rxname = dma_chan_name(host->dma_rx_channel); else
Currently, if DMA information isn't passed from platform data, then DMA will not be used. This patch allows DMA information obtained though Device Tree to be used as well. Cc: Russell King <linux@arm.linux.org.uk> Cc: Chris Ball <cjb@laptop.org> Cc: linux-mmc@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/mmc/host/mmci.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-)