[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <50BDF790.3080401@gmail.com>
Date: Tue, 04 Dec 2012 07:16:00 -0600
From: Rob Herring <robherring2@...il.com>
To: Wenyou Yang <wenyou.yang@...el.com>
CC: linux-arm-kernel@...ts.infradead.org, JM.Lin@...el.com,
linux-kernel@...r.kernel.org, rob.herring@...xeda.com,
devicetree-discuss@...ts.ozlabs.org
Subject: Re: [v2 PATCH 01/14] of: add dma-mask binding
On 12/04/2012 01:53 AM, Wenyou Yang wrote:
> From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
>
> This will allow each device to specify its dma-mask for this we use the
> coherent_dma_mask as pointer. By default the dma-mask will be set to
> DMA_BIT_MASK(32).
> The microblaze architecture hook is drop
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
> Cc: grant.likely@...retlab.ca
> Cc: rob.herring@...xeda.com
> Cc: devicetree-discuss@...ts.ozlabs.org
> ---
My same comment as the last version applies. Use dma-ranges.
Rob
> drivers/of/platform.c | 23 ++++++++++++++++-------
> 1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/of/platform.c b/drivers/of/platform.c
> index b80891b..31ed405 100644
> --- a/drivers/of/platform.c
> +++ b/drivers/of/platform.c
> @@ -130,6 +130,21 @@ void of_device_make_bus_id(struct device *dev)
> dev_set_name(dev, "%s.%d", node->name, magic - 1);
> }
>
> +static void of_get_dma_mask(struct device *dev, struct device_node *np)
> +{
> + const __be32 *prop;
> + int len;
> +
> + prop = of_get_property(np, "dma-mask", &len);
> +
> + dev->dma_mask = &dev->coherent_dma_mask;
> +
> + if (!prop)
> + dev->coherent_dma_mask = DMA_BIT_MASK(32);
> + else
> + dev->coherent_dma_mask = of_read_number(prop, len / 4);
> +}
> +
> /**
> * of_device_alloc - Allocate and initialize an of_device
> * @np: device node to assign to device
> @@ -171,10 +186,8 @@ struct platform_device *of_device_alloc(struct device_node *np,
> WARN_ON(of_irq_to_resource_table(np, res, num_irq) != num_irq);
> }
>
> + of_get_dma_mask(&dev->dev, np);
> dev->dev.of_node = of_node_get(np);
> -#if defined(CONFIG_MICROBLAZE)
> - dev->dev.dma_mask = &dev->archdata.dma_mask;
> -#endif
> dev->dev.parent = parent;
>
> if (bus_id)
> @@ -211,10 +224,6 @@ struct platform_device *of_platform_device_create_pdata(
> if (!dev)
> return NULL;
>
> -#if defined(CONFIG_MICROBLAZE)
> - dev->archdata.dma_mask = 0xffffffffUL;
> -#endif
> - dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
> dev->dev.bus = &platform_bus_type;
> dev->dev.platform_data = platform_data;
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists