From: Wenyou Yang <wenyou.yang@atmel.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, nicolas.ferre@atmel.com,
plagnioj@jcrosoft.com, richard.genoud@gmail.com,
JM.Lin@atmel.com, wenyou.yang@atmel.com,
grant.likely@secretlab.ca, rob.herring@calxeda.com,
devicetree-discuss@lists.ozlabs.org
Subject: [v2 PATCH 01/14] of: add dma-mask binding
Date: Tue, 4 Dec 2012 15:53:47 +0800 [thread overview]
Message-ID: <1354607640-13229-2-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1354607640-13229-1-git-send-email-wenyou.yang@atmel.com>
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.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@jcrosoft.com>
Cc: grant.likely@secretlab.ca
Cc: rob.herring@calxeda.com
Cc: devicetree-discuss@lists.ozlabs.org
---
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;
--
1.7.9.5
next prev parent reply other threads:[~2012-12-04 7:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-04 7:53 [v2 PATCH 00/14] atmel SPI controller with dmaengine and device tree support Wenyou Yang
2012-12-04 7:53 ` Wenyou Yang [this message]
2012-12-04 13:16 ` [v2 PATCH 01/14] of: add dma-mask binding Rob Herring
2012-12-04 7:53 ` [v2 PATCH 02/14] of_spi: add generic binding support to specify cs gpio Wenyou Yang
2012-12-05 23:28 ` Grant Likely
2012-12-04 7:53 ` [v2 PATCH 03/14] spi/atmel_spi: add physical base address Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 04/14] spi/atmel_spi: call unmapping on transfers buffers Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 05/14] spi/atmel_spi: status information passed through controller data Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 06/14] spi/atmel_spi: add flag to controller data for lock operations Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 07/14] spi/atmel_spi: add DT support Wenyou Yang
2012-12-07 6:58 ` Jean-Christophe PLAGNIOL-VILLARD
2012-12-04 7:53 ` [v2 PATCH 08/14] spi/atmel_spi: add dmaengine support Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 09/14] spi/atmel_spi: Fix spi-atmel driver to adapt to slave_config changes Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 10/14] spi/atmel_spi: correct 16 bits transfers using PIO Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 11/14] spi/atmel_spi: correct 16 bits transfer with DMA Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 12/14] ARM: at91: add clocks for spi DT entries Wenyou Yang
2012-12-04 7:53 ` [v2 PATCH 13/14] ARM: dts: add spi nodes for atmel SoC Wenyou Yang
[not found] ` <50C0C9C9.9000108@atmel.com>
2012-12-07 1:34 ` Yang, Wenyou
2012-12-07 6:56 ` Jean-Christophe PLAGNIOL-VILLARD
2012-12-04 7:54 ` [v2 PATCH 14/14] ARM: dts: add spi nodes for atmel boards Wenyou Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354607640-13229-2-git-send-email-wenyou.yang@atmel.com \
--to=wenyou.yang@atmel.com \
--cc=JM.Lin@atmel.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=richard.genoud@gmail.com \
--cc=rob.herring@calxeda.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®