Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9d571be authored by Robin Murphy's avatar Robin Murphy Committed by Catalin Marinas
Browse files

of: amba: use of_dma_configure for AMBA devices 



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: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 668ebd10

drivers/of/platform.c

+3 −4
Original line number Diff line number Diff line
@@ -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
@@ -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;
@@ -291,7 +290,6 @@ 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;
@@ -299,6 +297,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, 
		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);