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

Commit d3aa0ced authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Matt Wagantall
Browse files

FROMLIST: drivers: of: initialize and assign reserved memory to newly created devices 



Use recently introduced of_reserved_mem_device_init() function to
automatically assign respective reserved memory region to the newly created
platform and amba device.

Change-Id: I72c0557c00ed515d55bb13acb8c0ea342cf2bf90
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Patch-mainline: linux-arm-kernel @ 07/02/14, 12:48
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
[lmark@codeaurora.org: remove of_dma_configure]
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent cedb55eb

drivers/of/platform.c

+7 −55
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/of_reserved_mem.h>

#include <linux/platform_device.h>



const struct of_device_id of_default_bus_match_table[] = {
@@ -149,59 +150,6 @@ struct platform_device *of_device_alloc(struct device_node *np, 
}

EXPORT_SYMBOL(of_device_alloc);



/**

 * of_dma_configure - Setup DMA configuration

 * @dev:	Device to apply DMA configuration

 *

 * Try to get devices's DMA configuration from DT and update it

 * accordingly.

 *

 * In case if platform code need to use own special DMA configuration,it

 * can use Platform bus notifier and handle BUS_NOTIFY_ADD_DEVICE event

 * to fix up DMA configuration.

 */

static void of_dma_configure(struct device *dev)

{

	u64 dma_addr, paddr, size;

	int ret;



	/*

	 * Set default dma-mask to 32 bit. Drivers are expected to setup

	 * the correct supported dma_mask.

	 */

	dev->coherent_dma_mask = DMA_BIT_MASK(32);



	/*

	 * Set it to coherent_dma_mask by default if the architecture

	 * code has not set it.

	 */

	if (!dev->dma_mask)

		dev->dma_mask = &dev->coherent_dma_mask;



	/*

	 * if dma-coherent property exist, call arch hook to setup

	 * dma coherent operations.

	 */

	if (of_dma_is_coherent(dev->of_node)) {

		set_arch_dma_coherent_ops(dev);

		dev_dbg(dev, "device is dma coherent\n");

	}



	/*

	 * if dma-ranges property doesn't exist - just return else

	 * setup the dma offset

	 */

	ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size);

	if (ret < 0) {

		dev_dbg(dev, "no dma range information to setup\n");

		return;

	}



	/* DMA ranges found. Calculate and set dma_pfn_offset */

	dev->dma_pfn_offset = PFN_DOWN(paddr - dma_addr);

	dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", dev->dma_pfn_offset);

}



/**

 * of_platform_device_create_pdata - Alloc, initialize and register an of_device

 * @np: pointer to node to create device for
@@ -228,16 +176,18 @@ static struct platform_device *of_platform_device_create_pdata( 
	if (!dev)

		goto err_clear_flag;



	of_dma_configure(&dev->dev);

	dev->dev.bus = &platform_bus_type;

	dev->dev.platform_data = platform_data;



	of_reserved_mem_device_init(&dev->dev);



	/* We do not fill the DMA ops for platform devices by default.

	 * This is currently the responsibility of the platform code

	 * to do such, possibly using a device notifier

	 */



	if (of_device_add(dev) != 0) {

		of_reserved_mem_device_release(&dev->dev);

		platform_device_put(dev);

		goto err_clear_flag;

	}
@@ -297,7 +247,8 @@ 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);



	of_reserved_mem_device_init(&dev->dev);



	/* Allow the HW Peripheral ID to be overridden */

	prop = of_get_property(node, "arm,primecell-periphid", NULL);
@@ -325,6 +276,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, 
	return dev;



err_free:

	of_reserved_mem_device_release(&dev->dev);

	amba_device_put(dev);

err_clear_flag:

	of_node_clear_flag(node, OF_POPULATED);