lkml.org 
[lkml]   [2011]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH v2 5/5] spi/ep93xx: add DMA support
    On Tue, Jun 7, 2011 at 11:14 AM, Mika Westerberg <mika.westerberg@iki.fi> wrote:
    > 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?

    Yes, put the whole series into a separate branch all by itself. Merge
    that branch into Vinod's tree and I'll also merge it into spi/next,
    and I'll fix up the merge conflict when I do.

    g.

    --
    Grant Likely, B.Sc., P.Eng.
    Secret Lab Technologies Ltd.


    \
     
     \ /
      Last update: 2011-06-07 20:47    [W:0.022 / U:0.696 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site