raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #954 from pelwell/rpi-4.0.y

Browse Source 
bcm2835-mmc/sdhost: of_dma_request_slave_channel isn't exported
This commit is contained in:
popcornmix
2015-05-05 15:19:23 +01:00
parent fdc5e42967 503ce7c5d4
commit 75c5da712b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/host/bcm2835-mmc.c
View File

@@ -1493,8 +1493,8 @@ static int bcm2835_mmc_probe(struct platform_device *pdev)
if (!(mmc_debug & (1<<12))) { if (!(mmc_debug & (1<<12))) {
if (node) { if (node) {
host->dma_chan_tx = of_dma_request_slave_channel(node, "tx"); host->dma_chan_tx = dma_request_slave_channel(dev, "tx");
host->dma_chan_rx = of_dma_request_slave_channel(node, "rx"); host->dma_chan_rx = dma_request_slave_channel(dev, "rx");
} else { } else {
dma_cap_mask_t mask; dma_cap_mask_t mask;

4
drivers/mmc/host/bcm2835-sdhost.c
View File

@@ -1578,9 +1578,9 @@ static int bcm2835_sdhost_probe(struct platform_device *pdev)
if (host->allow_dma) { if (host->allow_dma) {
if (node) { if (node) {
host->dma_chan_tx = host->dma_chan_tx =
of_dma_request_slave_channel(node, "tx"); dma_request_slave_channel(dev, "tx");
host->dma_chan_rx = host->dma_chan_rx =
of_dma_request_slave_channel(node, "rx"); dma_request_slave_channel(dev, "rx");
} else { } else {
dma_cap_mask_t mask; dma_cap_mask_t mask;