Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

dmaengine: cppi41: Remove usbss_mem

Browse Source 
In order to make CPPI 4.1 DMA driver more generic, accesses to USBSS
have been removed. So it is not required anymore to map the "glue"
register's.
Remove usbss_mem.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Alexandre Bailon 2017-02-15 14:56:32 +01:00 committed by Vinod Koul
parent c1ae3cfa0e
commit 6ee60246ac
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/dma/cppi41.c
View File

@ -131,7 +131,6 @@ struct cppi41_dd {
u32 first_td_desc; u32 first_td_desc;
struct cppi41_channel *chan_busy[ALLOC_DECS_NUM]; struct cppi41_channel *chan_busy[ALLOC_DECS_NUM];
void __iomem *usbss_mem;
void __iomem *ctrl_mem; void __iomem *ctrl_mem;
void __iomem *sched_mem; void __iomem *sched_mem;
void __iomem *qmgr_mem; void __iomem *qmgr_mem;
@ -995,6 +994,7 @@ static int cppi41_dma_probe(struct platform_device *pdev)
struct cppi41_dd *cdd; struct cppi41_dd *cdd;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
const struct cppi_glue_infos *glue_info; const struct cppi_glue_infos *glue_info;
int index;
int irq; int irq;
int ret; int ret;
@ -1021,16 +1021,20 @@ static int cppi41_dma_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&cdd->ddev.channels); INIT_LIST_HEAD(&cdd->ddev.channels);
cpp41_dma_info.dma_cap = cdd->ddev.cap_mask; cpp41_dma_info.dma_cap = cdd->ddev.cap_mask;
cdd->usbss_mem = of_iomap(dev->of_node, 0); index = of_property_match_string(dev->of_node,
cdd->ctrl_mem = of_iomap(dev->of_node, 1); "reg-names", "controller");
cdd->sched_mem = of_iomap(dev->of_node, 2); if (index < 0)
cdd->qmgr_mem = of_iomap(dev->of_node, 3); return index;
cdd->ctrl_mem = of_iomap(dev->of_node, index);
cdd->sched_mem = of_iomap(dev->of_node, index + 1);
cdd->qmgr_mem = of_iomap(dev->of_node, index + 2);
spin_lock_init(&cdd->lock); spin_lock_init(&cdd->lock);
INIT_LIST_HEAD(&cdd->pending); INIT_LIST_HEAD(&cdd->pending);
platform_set_drvdata(pdev, cdd); platform_set_drvdata(pdev, cdd);
if (!cdd->usbss_mem || !cdd->ctrl_mem || !cdd->sched_mem || if (!cdd->ctrl_mem || !cdd->sched_mem ||
!cdd->qmgr_mem) !cdd->qmgr_mem)
return -ENXIO; return -ENXIO;
@ -1090,7 +1094,6 @@ err_init_cppi:
err_get_sync: err_get_sync:
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
pm_runtime_disable(dev); pm_runtime_disable(dev);
iounmap(cdd->usbss_mem);
iounmap(cdd->ctrl_mem); iounmap(cdd->ctrl_mem);
iounmap(cdd->sched_mem); iounmap(cdd->sched_mem);
iounmap(cdd->qmgr_mem); iounmap(cdd->qmgr_mem);
@ -1112,7 +1115,6 @@ static int cppi41_dma_remove(struct platform_device *pdev)
devm_free_irq(&pdev->dev, cdd->irq, cdd); devm_free_irq(&pdev->dev, cdd->irq, cdd);
cleanup_chans(cdd); cleanup_chans(cdd);
deinit_cppi41(&pdev->dev, cdd); deinit_cppi41(&pdev->dev, cdd);
iounmap(cdd->usbss_mem);
iounmap(cdd->ctrl_mem); iounmap(cdd->ctrl_mem);
iounmap(cdd->sched_mem); iounmap(cdd->sched_mem);
iounmap(cdd->qmgr_mem); iounmap(cdd->qmgr_mem);