diff for duplicates of <1479309152.24056.45.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index dd8138f..3d44a59 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On Wed, 2016-11-16@16:56 +0300, Eugeniy Paltsev wrote: +On Wed, 2016-11-16 at 16:56 +0300, Eugeniy Paltsev wrote: > Memory-to-memory dma transfers were disabled by default if we > used DT to cofigure DMAC. > Add is-memcpu property, so it became possible to enable @@ -7,26 +7,26 @@ On Wed, 2016-11-16@16:56 +0300, Eugeniy Paltsev wrote: Fix "memcpu" to "memcpy" everywhere you use it. > -> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev at synopsys.com> +> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> > --- -> ?drivers/dma/dw/platform.c | 3 +++ -> ?1 file changed, 3 insertions(+) +> drivers/dma/dw/platform.c | 3 +++ +> 1 file changed, 3 insertions(+) > > diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c > index 4103f1d..daeceac 100644 > --- a/drivers/dma/dw/platform.c > +++ b/drivers/dma/dw/platform.c > @@ -131,6 +131,9 @@ dw_dma_parse_dt(struct platform_device *pdev) -> ? else if (of_property_read_bool(np, "is-private")) -> ? pdata->is_private = true; -> ? +> else if (of_property_read_bool(np, "is-private")) +> pdata->is_private = true; +> > + if (of_property_read_bool(np, "is-memcpu")) > + pdata->is_memcpy = true; > + -> ? if (!of_property_read_u32(np, "chan_allocation_order", &tmp)) -> ? pdata->chan_allocation_order = (unsigned char)tmp; -> ? +> if (!of_property_read_u32(np, "chan_allocation_order", &tmp)) +> pdata->chan_allocation_order = (unsigned char)tmp; +> -- -Andy Shevchenko <andriy.shevchenko at linux.intel.com> +Andy Shevchenko <andriy.shevchenko@linux.intel.com> Intel Finland Oy diff --git a/a/content_digest b/N1/content_digest index 955a33a..e7311e6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,21 @@ "ref\01479304615-11360-1-git-send-email-Eugeniy.Paltsev@synopsys.com\0" "ref\01479304615-11360-3-git-send-email-Eugeniy.Paltsev@synopsys.com\0" - "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" - "Subject\0[PATCH 2/4] DW DMAC: add is-memcpu property to device tree\0" + "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" + "Subject\0Re: [PATCH 2/4] DW DMAC: add is-memcpu property to device tree\0" "Date\0Wed, 16 Nov 2016 17:12:32 +0200\0" - "To\0linux-snps-arc@lists.infradead.org\0" + "To\0Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>" + " devicetree@vger.kernel.org\0" + "Cc\0robh+dt@kernel.org" + mark.rutland@arm.com + linux-kernel@vger.kernel.org + vireshk@kernel.org + dan.j.williams@intel.com + vinod.koul@intel.com + dmaengine@vger.kernel.org + " linux-snps-arc@lists.infradead.org\0" "\00:1\0" "b\0" - "On Wed, 2016-11-16@16:56 +0300, Eugeniy Paltsev wrote:\n" + "On Wed, 2016-11-16 at 16:56 +0300, Eugeniy Paltsev wrote:\n" "> Memory-to-memory dma transfers were disabled by default if we\n" "> used DT to cofigure DMAC.\n" "> Add is-memcpu property, so it became possible to enable\n" @@ -15,28 +24,28 @@ "Fix \"memcpu\" to \"memcpy\" everywhere you use it.\n" "\n" "> \n" - "> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev at synopsys.com>\n" + "> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>\n" "> ---\n" - "> ?drivers/dma/dw/platform.c | 3 +++\n" - "> ?1 file changed, 3 insertions(+)\n" + "> \302\240drivers/dma/dw/platform.c | 3 +++\n" + "> \302\2401 file changed, 3 insertions(+)\n" "> \n" "> diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c\n" "> index 4103f1d..daeceac 100644\n" "> --- a/drivers/dma/dw/platform.c\n" "> +++ b/drivers/dma/dw/platform.c\n" "> @@ -131,6 +131,9 @@ dw_dma_parse_dt(struct platform_device *pdev)\n" - "> ?\telse if (of_property_read_bool(np, \"is-private\"))\n" - "> ?\t\tpdata->is_private = true;\n" - "> ?\n" + "> \302\240\telse if (of_property_read_bool(np, \"is-private\"))\n" + "> \302\240\t\tpdata->is_private = true;\n" + "> \302\240\n" "> +\tif (of_property_read_bool(np, \"is-memcpu\"))\n" "> +\t\tpdata->is_memcpy = true;\n" "> +\n" - "> ?\tif (!of_property_read_u32(np, \"chan_allocation_order\", &tmp))\n" - "> ?\t\tpdata->chan_allocation_order = (unsigned char)tmp;\n" - "> ?\n" + "> \302\240\tif (!of_property_read_u32(np, \"chan_allocation_order\", &tmp))\n" + "> \302\240\t\tpdata->chan_allocation_order = (unsigned char)tmp;\n" + "> \302\240\n" "\n" "-- \n" - "Andy Shevchenko <andriy.shevchenko at linux.intel.com>\n" + "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -c8f1e8342bb75e1830afdef3ca1430d86ef13e726ab4effedab5bed012feaf27 +0f4ec0cae8a5ac73c1153f29ecfad6ed963b5c40f0ecafa97d5cfc1d195bc37c
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.