From: Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Wenyou Yang <wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> Cc: JM.Lin-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Subject: Re: [PATCH 01/17] of: add dma-mask binding Date: Tue, 13 Nov 2012 21:55:56 -0600 [thread overview] Message-ID: <50A3164C.3070301@gmail.com> (raw) In-Reply-To: <1352710357-3265-2-git-send-email-wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> On 11/12/2012 02:52 AM, Wenyou Yang wrote: > From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> > > 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). Do you really have a use case this is not DMA_BIT_MASK(32)? > The microblaze architecture hook is drop > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> > Cc: grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org > Cc: rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org > Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.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); dma-ranges may work for this purpose. > + > + dev->dma_mask = &dev->coherent_dma_mask; I don't really know, but I suspect this is wrong. > + > + 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; > >
WARNING: multiple messages have this Message-ID (diff)
From: robherring2@gmail.com (Rob Herring) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/17] of: add dma-mask binding Date: Tue, 13 Nov 2012 21:55:56 -0600 [thread overview] Message-ID: <50A3164C.3070301@gmail.com> (raw) In-Reply-To: <1352710357-3265-2-git-send-email-wenyou.yang@atmel.com> On 11/12/2012 02:52 AM, Wenyou Yang wrote: > 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). Do you really have a use case this is not DMA_BIT_MASK(32)? > The microblaze architecture hook is drop > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Cc: grant.likely at secretlab.ca > Cc: rob.herring at calxeda.com > Cc: devicetree-discuss at 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); dma-ranges may work for this purpose. > + > + dev->dma_mask = &dev->coherent_dma_mask; I don't really know, but I suspect this is wrong. > + > + 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; > >
next prev parent reply other threads:[~2012-11-14 3:55 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-12 8:52 [PATCH 00/17] atmel SoC SPI controller with dmaengine and DT Wenyou Yang 2012-11-12 8:52 ` [PATCH 01/17] of: add dma-mask binding Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang [not found] ` <1352710357-3265-2-git-send-email-wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> 2012-11-14 3:55 ` Rob Herring [this message] 2012-11-14 3:55 ` Rob Herring [not found] ` <50A3164C.3070301-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-11-14 6:00 ` Jean-Christophe PLAGNIOL-VILLARD 2012-11-14 6:00 ` Jean-Christophe PLAGNIOL-VILLARD [not found] ` <20121114060058.GM4576-RQcB7r2h9QmfDR2tN2SG5Ni2O/JbrIOy@public.gmane.org> 2012-11-14 20:56 ` Rob Herring 2012-11-14 20:56 ` Rob Herring [not found] ` <50A4056E.9090700-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-11-14 21:05 ` Russell King - ARM Linux 2012-11-14 21:05 ` Russell King - ARM Linux [not found] ` <1352710357-3265-1-git-send-email-wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> 2012-11-12 8:52 ` [PATCH 02/17] of_spi: add generic binding support to specify cs gpio Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 03/17] spi/atmel_spi: add physical base address Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 04/17] spi/atmel_spi: call unmapping on transfers buffers Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 05/17] spi/atmel_spi: status information passed through controller data Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 06/17] spi/atmel_spi: add flag to controller data for lock operations Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang [not found] ` <1352710357-3265-7-git-send-email-wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> 2012-11-15 9:36 ` Shubhrajyoti Datta 2012-11-15 9:36 ` Shubhrajyoti Datta 2012-11-12 8:52 ` [PATCH 07/17] spi/atmel_spi: add dmaengine support Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 08/17] spi/atmel_spi: Fix spi-atmel driver to adapt to slave_config changes Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 09/17] spi/atmel_spi: correct 16 bits transfers using PIO Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 10/17] spi/atmel_spi: correct 16 bits transfer with DMA Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 12/17] spi/atmel_spi: add version propety as the spi data Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 13/17] spi/atmel_spi: add function to read the spi data from the dts Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 11/17] spi/atmel_spi: add DT support Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 8:52 ` [PATCH 14/17] ARM: at91: add clocks for spi DT entries Wenyou Yang 2012-11-12 8:52 ` [PATCH 15/17] ARM: dts: add spi nodes for atmel SoC Wenyou Yang 2012-11-12 8:52 ` [PATCH 16/17] ARM: dts: add spi nodes for atmel boards Wenyou Yang 2012-11-12 8:52 ` [PATCH 17/17] mtd: m25p80: change the m25p80_read to reading page to page Wenyou Yang 2012-11-12 8:52 ` Wenyou Yang 2012-11-12 9:12 ` Baruch Siach 2012-11-12 9:12 ` Baruch Siach 2012-11-16 6:45 ` Yang, Wenyou 2012-11-16 6:45 ` Yang, Wenyou 2013-03-22 9:16 [PATCH 01/17] of: add dma-mask binding 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=50A3164C.3070301@gmail.com \ --to=robherring2-re5jqeeqqe8avxtiumwx3w@public.gmane.org \ --cc=JM.Lin-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org \ --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.