Skip to content

Commit

Permalink
of: amba: use of_dma_configure for AMBA devices
Browse files Browse the repository at this point in the history
Commit 591c1e ("of: configure the platform device dma parameters)
introduced a common mechanism to configure DMA from DT properties.
AMBA devices created from DT can take advantage of this, too.

Signed-off-by: Robin Murphy <[email protected]>
Acked-by: Will Deacon <[email protected]>
Acked-by: Rob Herring <[email protected]>
Signed-off-by: Catalin Marinas <[email protected]>
  • Loading branch information
rmurphy-arm authored and ctmarinas committed Sep 22, 2014
1 parent 668ebd1 commit c9d571b
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/of/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,10 @@ EXPORT_SYMBOL(of_device_alloc);
* can use Platform bus notifier and handle BUS_NOTIFY_ADD_DEVICE event
* to fix up DMA configuration.
*/
static void of_dma_configure(struct platform_device *pdev)
static void of_dma_configure(struct device *dev)
{
u64 dma_addr, paddr, size;
int ret;
struct device *dev = &pdev->dev;

/*
* Set default dma-mask to 32 bit. Drivers are expected to setup
Expand Down Expand Up @@ -229,7 +228,7 @@ static struct platform_device *of_platform_device_create_pdata(
if (!dev)
goto err_clear_flag;

of_dma_configure(dev);
of_dma_configure(&dev->dev);
dev->dev.bus = &platform_bus_type;
dev->dev.platform_data = platform_data;

Expand Down Expand Up @@ -291,14 +290,14 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
}

/* setup generic device info */
dev->dev.coherent_dma_mask = ~0;
dev->dev.of_node = of_node_get(node);
dev->dev.parent = parent;
dev->dev.platform_data = platform_data;
if (bus_id)
dev_set_name(&dev->dev, "%s", bus_id);
else
of_device_make_bus_id(&dev->dev);
of_dma_configure(&dev->dev);

/* Allow the HW Peripheral ID to be overridden */
prop = of_get_property(node, "arm,primecell-periphid", NULL);
Expand Down

0 comments on commit c9d571b

Please sign in to comment.