From: mika.westerberg@iki.fi (Mika Westerberg)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/5] spi/ep93xx: add DMA support
Date: Tue, 7 Jun 2011 20:14:04 +0300 [thread overview]
Message-ID: <20110607171403.GA3011@acer> (raw)
In-Reply-To: <20110603204400.GH17972@ponder.secretlab.ca>
On Fri, Jun 03, 2011 at 02:44:00PM -0600, Grant Likely wrote:
> On Sun, May 29, 2011 at 01:10:06PM +0300, Mika Westerberg wrote:
> > This patch adds DMA support for the EP93xx SPI driver. By default the DMA is
> > not enabled but it can be enabled by setting ep93xx_spi_info.use_dma to true
> > in board configuration file.
> >
> > Note that the SPI driver still uses PIO for small transfers (<= 8 bytes) for
> > performance reasons.
> >
> > Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
> > Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
>
> Acked-by: Grant Likely <grant.likely@secretlab.ca>
>
> Since this depends on the DMA patches, it can go in via the same tree.
I just realized that once the SPI driver renaming patch (spi: reorganize
drivers) enters linux-next, this patch (which sits on Vinod's tree) will cause
a merge conflict. Any ideas how to avoid it beforehand?
WARNING: multiple messages have this Message-ID (diff)
From: Mika Westerberg <mika.westerberg@iki.fi>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-arm-kernel@lists.infradead.org,
hsweeten@visionengravers.com, rmallon@gmail.com,
vinod.koul@intel.com, dan.j.williams@intel.com, lrg@ti.com,
broonie@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 5/5] spi/ep93xx: add DMA support
Date: Tue, 7 Jun 2011 20:14:04 +0300 [thread overview]
Message-ID: <20110607171403.GA3011@acer> (raw)
In-Reply-To: <20110603204400.GH17972@ponder.secretlab.ca>
On Fri, Jun 03, 2011 at 02:44:00PM -0600, Grant Likely wrote:
> On Sun, May 29, 2011 at 01:10:06PM +0300, Mika Westerberg wrote:
> > This patch adds DMA support for the EP93xx SPI driver. By default the DMA is
> > not enabled but it can be enabled by setting ep93xx_spi_info.use_dma to true
> > in board configuration file.
> >
> > Note that the SPI driver still uses PIO for small transfers (<= 8 bytes) for
> > performance reasons.
> >
> > Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
> > Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
>
> Acked-by: Grant Likely <grant.likely@secretlab.ca>
>
> Since this depends on the DMA patches, it can go in via the same tree.
I just realized that once the SPI driver renaming patch (spi: reorganize
drivers) enters linux-next, this patch (which sits on Vinod's tree) will cause
a merge conflict. Any ideas how to avoid it beforehand?
next prev parent reply other threads:[~2011-06-07 17:14 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-29 10:10 [PATCH v2 0/5] ep93xx DMA patches Mika Westerberg
2011-05-29 10:10 ` Mika Westerberg
2011-05-29 10:10 ` [PATCH v2 1/5] dmaengine: add ep93xx DMA support Mika Westerberg
2011-05-29 10:10 ` Mika Westerberg
2011-11-15 15:02 ` Rafal Prylowski
2011-11-15 15:02 ` Rafal Prylowski
2011-11-15 17:59 ` H Hartley Sweeten
2011-11-15 17:59 ` H Hartley Sweeten
2011-11-16 6:48 ` Mika Westerberg
2011-11-16 6:48 ` Mika Westerberg
2011-11-16 9:00 ` Rafal Prylowski
2011-11-16 9:00 ` Rafal Prylowski
2011-11-16 6:55 ` Mika Westerberg
2011-11-16 6:55 ` Mika Westerberg
2011-11-16 8:31 ` Rafal Prylowski
2011-11-16 8:31 ` Rafal Prylowski
2011-11-19 12:38 ` Mika Westerberg
2011-11-19 12:38 ` Mika Westerberg
2011-11-21 7:44 ` Rafal Prylowski
2011-11-21 7:44 ` Rafal Prylowski
2011-11-21 8:01 ` Mika Westerberg
2011-11-21 8:01 ` Mika Westerberg
2011-11-21 8:32 ` Vinod Koul
2011-11-21 8:32 ` Vinod Koul
2011-11-22 5:59 ` Mika Westerberg
2011-11-22 5:59 ` Mika Westerberg
2011-11-23 10:47 ` Vinod Koul
2011-11-23 10:47 ` Vinod Koul
2011-11-21 8:54 ` Rafal Prylowski
2011-11-21 8:54 ` Rafal Prylowski
2011-11-22 6:47 ` Mika Westerberg
2011-11-22 6:47 ` Mika Westerberg
2011-11-22 8:45 ` Rafal Prylowski
2011-11-22 8:45 ` Rafal Prylowski
2011-05-29 10:10 ` [PATCH v2 2/5] ep93xx: add dmaengine platform code Mika Westerberg
2011-05-29 10:10 ` Mika Westerberg
2011-05-29 10:10 ` [PATCH v2 3/5] ASoC: ep93xx: convert to use the DMA engine API Mika Westerberg
2011-05-29 10:10 ` Mika Westerberg
2011-05-29 10:10 ` [PATCH v2 4/5] ep93xx: remove the old M2P DMA code Mika Westerberg
2011-05-29 10:10 ` Mika Westerberg
2011-05-29 10:10 ` [PATCH v2 5/5] spi/ep93xx: add DMA support Mika Westerberg
2011-05-29 10:10 ` Mika Westerberg
2011-06-03 20:44 ` Grant Likely
2011-06-03 20:44 ` Grant Likely
2011-06-07 17:14 ` Mika Westerberg [this message]
2011-06-07 17:14 ` Mika Westerberg
2011-06-07 18:45 ` Grant Likely
2011-06-07 18:45 ` Grant Likely
2011-06-07 19:06 ` Mika Westerberg
2011-06-07 19:06 ` Mika Westerberg
2011-06-07 19:18 ` Grant Likely
2011-06-07 19:18 ` Grant Likely
2011-06-07 19:29 ` Mika Westerberg
2011-06-07 19:29 ` Mika Westerberg
2011-06-07 19:40 ` Grant Likely
2011-06-07 19:40 ` Grant Likely
2011-06-08 3:58 ` Koul, Vinod
2011-06-08 3:58 ` Koul, Vinod
2011-06-08 21:53 ` Grant Likely
2011-06-08 21:53 ` Grant Likely
2011-06-09 16:42 ` Koul, Vinod
2011-06-09 16:42 ` Koul, Vinod
2011-06-09 18:46 ` Grant Likely
2011-06-09 18:46 ` Grant Likely
2011-06-09 19:15 ` Mika Westerberg
2011-06-09 19:15 ` Mika Westerberg
2011-06-05 8:19 ` [PATCH v2 0/5] ep93xx DMA patches Mika Westerberg
2011-06-05 8:19 ` Mika Westerberg
2011-06-06 6:39 ` Koul, Vinod
2011-06-06 6:39 ` Koul, Vinod
2011-06-06 16:42 ` Mika Westerberg
2011-06-06 16:42 ` Mika Westerberg
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=20110607171403.GA3011@acer \
--to=mika.westerberg@iki.fi \
--cc=linux-arm-kernel@lists.infradead.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: link
Be 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.