From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vinod.koul@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Russell King - ARM Linux" <linux@arm.linux.org.uk>
Subject: linux-next: manual merge of the slave-dma tree with Linus' tree
Date: Wed, 27 Jul 2011 12:08:26 +1000 [thread overview]
Message-ID: <20110727120826.ea1227276707790e162dee18@canb.auug.org.au> (raw)
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
drivers/spi/spi-pl022.c (called drivers/spi/amba-pl022.c in the sleav-dma
tree) between commit 083be3f05371 ("spi/pl022: initialize burstsize from
FIFO trigger level") from Linus' tree and commit 001b0585ff16 ("Improve
slave/cyclic DMA engine documentation") from the slave-dma tree.
I fixed it up (see below) anc acn carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/spi/spi-pl022.c
index eba88c7,99e7880..0000000
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@@ -910,11 -908,11 +910,9 @@@ static int configure_dma(struct pl022 *
{
struct dma_slave_config rx_conf = {
.src_addr = SSP_DR(pl022->phybase),
};
struct dma_slave_config tx_conf = {
.dst_addr = SSP_DR(pl022->phybase),
- .direction = DMA_TO_DEVICE,
- .dst_maxburst = pl022->vendor->fifodepth >> 1,
};
unsigned int pages;
int ret;
next reply other threads:[~2011-07-27 2:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 2:08 Stephen Rothwell [this message]
2011-07-27 3:12 ` linux-next: manual merge of the slave-dma tree with Linus' tree Koul, Vinod
2011-07-27 16:25 ` Koul, Vinod
2011-07-27 20:19 ` Russell King - ARM Linux
2011-07-27 20:29 ` Grant Likely
2011-08-26 1:46 Stephen Rothwell
2012-03-09 2:25 Stephen Rothwell
2012-03-27 0:45 Stephen Rothwell
2012-12-18 23:44 Stephen Rothwell
2019-01-23 2:41 Stephen Rothwell
2019-02-26 4:24 Stephen Rothwell
2019-02-26 17:22 ` Vinod Koul
2019-06-11 6:32 Stephen Rothwell
2019-06-11 10:08 ` Vinod Koul
2020-03-12 5:26 Stephen Rothwell
2020-03-12 7:16 ` Peter Ujfalusi
2020-03-13 12:42 ` Vinod Koul
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=20110727120826.ea1227276707790e162dee18@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=vinod.koul@intel.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;
as well as URLs for NNTP newsgroup(s).