Commit defb893f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kalle Valo

bcma: use of_dma_configure() to set initial dma mask

While fixing another bug, I noticed that bcma manually sets up
a dma_mask pointer for its child devices. We have a generic
helper for that now, which should be able to cope better with
any variations that might be needed to deal with cache coherency,
unusual DMA address offsets, iommus, or limited DMA masks, none
of which are currently handled here.

This changes the core to use the of_dma_configure(), like
we do for platform devices that are probed directly from
DT.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 5856cd5b
...@@ -209,6 +209,8 @@ static void bcma_of_fill_device(struct platform_device *parent, ...@@ -209,6 +209,8 @@ static void bcma_of_fill_device(struct platform_device *parent,
core->dev.of_node = node; core->dev.of_node = node;
core->irq = bcma_of_get_irq(parent, core, 0); core->irq = bcma_of_get_irq(parent, core, 0);
of_dma_configure(&core->dev, node);
} }
unsigned int bcma_core_irq(struct bcma_device *core, int num) unsigned int bcma_core_irq(struct bcma_device *core, int num)
...@@ -248,12 +250,12 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) ...@@ -248,12 +250,12 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
core->irq = bus->host_pci->irq; core->irq = bus->host_pci->irq;
break; break;
case BCMA_HOSTTYPE_SOC: case BCMA_HOSTTYPE_SOC:
core->dev.dma_mask = &core->dev.coherent_dma_mask; if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {
if (bus->host_pdev) {
core->dma_dev = &bus->host_pdev->dev; core->dma_dev = &bus->host_pdev->dev;
core->dev.parent = &bus->host_pdev->dev; core->dev.parent = &bus->host_pdev->dev;
bcma_of_fill_device(bus->host_pdev, core); bcma_of_fill_device(bus->host_pdev, core);
} else { } else {
core->dev.dma_mask = &core->dev.coherent_dma_mask;
core->dma_dev = &core->dev; core->dma_dev = &core->dev;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment