* linux-next: manual merge of the l2-mtd tree with the slave-dma tree
@ 2012-03-22 2:53 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2012-03-22 2:53 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: linux-next, linux-kernel, Alexandre Bounine, Vinod Koul,
Huang Shijie
[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/dma/mxs-dma.c between commit 185ecb5f4fd4 ("dmaengine: add
context parameter to prep_slave_sg and prep_dma_cyclic") from the
slave-dma tree and commit c790d78c631f ("mxs-dma : rewrite the last
parameter of mxs_dma_prep_slave_sg()") from the l2-mtd tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/dma/mxs-dma.c
index 65334c4,0ddfd30..0000000
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@@ -25,11 -26,8 +26,10 @@@
#include <asm/irq.h>
#include <mach/mxs.h>
- #include <mach/dma.h>
#include <mach/common.h>
+#include "dmaengine.h"
+
/*
* NOTE: The term "PIO" throughout the mxs-dma implementation means
* PIO mode of mxs apbh-dma and apbx-dma. With this working mode,
@@@ -340,7 -374,7 +362,7 @@@ static void mxs_dma_free_chan_resources
static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
struct dma_chan *chan, struct scatterlist *sgl,
unsigned int sg_len, enum dma_transfer_direction direction,
- unsigned long append, void *context)
- unsigned long flags)
++ unsigned long flags, void *context)
{
struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the l2-mtd tree with the slave-dma tree
@ 2012-03-22 3:04 Stephen Rothwell
2012-03-22 9:32 ` Artem Bityutskiy
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2012-03-22 3:04 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: linux-next, linux-kernel, Alexandre Bounine, Vinod Koul,
Huang Shijie
[-- Attachment #1: Type: text/plain, Size: 3554 bytes --]
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/nand/gpmi-nand/gpmi-lib.c between commit 16052827d98f
("dmaengine/dma_slave: introduce inline wrappers") from the slave-dma
tree and commit c790d78c631f ("mxs-dma : rewrite the last parameter of
mxs_dma_prep_slave_sg()") from the l2-mtd tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index 590dd5c,c34dab1..0000000
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@@ -848,7 -848,10 +848,9 @@@ int gpmi_send_command(struct gpmi_nand_
sg_init_one(sgl, this->cmd_buffer, this->command_length);
dma_map_sg(this->dev, sgl, 1, DMA_TO_DEVICE);
- desc = dmaengine_prep_slave_sg(channel, sgl, 1, DMA_MEM_TO_DEV, 1);
- desc = channel->device->device_prep_slave_sg(channel,
- sgl, 1, DMA_MEM_TO_DEV,
++ desc = dmaengine_prep_slave_sg(channel, sgl, 1, DMA_MEM_TO_DEV,
+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+
if (!desc) {
pr_err("step 2 error\n");
return -1;
@@@ -888,8 -892,9 +890,9 @@@ int gpmi_send_data(struct gpmi_nand_dat
/* [2] send DMA request */
prepare_data_dma(this, DMA_TO_DEVICE);
- desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
+ desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
- 1, DMA_MEM_TO_DEV, 1);
+ 1, DMA_MEM_TO_DEV,
+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc) {
pr_err("step 2 error\n");
return -1;
@@@ -924,8 -929,9 +927,9 @@@ int gpmi_read_data(struct gpmi_nand_dat
/* [2] : send DMA request */
prepare_data_dma(this, DMA_FROM_DEVICE);
- desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
+ desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
- 1, DMA_DEV_TO_MEM, 1);
+ 1, DMA_DEV_TO_MEM,
+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc) {
pr_err("step 2 error\n");
return -1;
@@@ -970,8 -976,10 +974,9 @@@ int gpmi_send_page(struct gpmi_nand_dat
pio[4] = payload;
pio[5] = auxiliary;
- desc = channel->device->device_prep_slave_sg(channel,
- (struct scatterlist *)pio,
+ desc = dmaengine_prep_slave_sg(channel, (struct scatterlist *)pio,
- ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
+ ARRAY_SIZE(pio), DMA_TRANS_NONE,
+ DMA_CTRL_ACK);
if (!desc) {
pr_err("step 2 error\n");
return -1;
@@@ -1033,9 -1041,10 +1038,10 @@@ int gpmi_read_page(struct gpmi_nand_dat
pio[3] = geo->page_size;
pio[4] = payload;
pio[5] = auxiliary;
- desc = channel->device->device_prep_slave_sg(channel,
+ desc = dmaengine_prep_slave_sg(channel,
(struct scatterlist *)pio,
- ARRAY_SIZE(pio), DMA_TRANS_NONE, 1);
+ ARRAY_SIZE(pio), DMA_TRANS_NONE,
+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc) {
pr_err("step 2 error\n");
return -1;
@@@ -1052,9 -1061,11 +1058,11 @@@
| BF_GPMI_CTRL0_ADDRESS(address)
| BF_GPMI_CTRL0_XFER_COUNT(geo->page_size);
pio[1] = 0;
+ pio[2] = 0; /* clear GPMI_HW_GPMI_ECCCTRL, disable the BCH. */
- desc = channel->device->device_prep_slave_sg(channel,
+ desc = dmaengine_prep_slave_sg(channel,
- (struct scatterlist *)pio, 2,
- DMA_TRANS_NONE, 1);
+ (struct scatterlist *)pio, 3,
+ DMA_TRANS_NONE,
+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc) {
pr_err("step 3 error\n");
return -1;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the l2-mtd tree with the slave-dma tree
2012-03-22 3:04 linux-next: manual merge of the l2-mtd tree with the slave-dma tree Stephen Rothwell
@ 2012-03-22 9:32 ` Artem Bityutskiy
2012-03-26 6:18 ` Vinod Koul
0 siblings, 1 reply; 4+ messages in thread
From: Artem Bityutskiy @ 2012-03-22 9:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Alexandre Bounine, Vinod Koul,
Huang Shijie
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
On Thu, 2012-03-22 at 14:04 +1100, Stephen Rothwell wrote:
> Hi Artem,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> drivers/mtd/nand/gpmi-nand/gpmi-lib.c between commit 16052827d98f
> ("dmaengine/dma_slave: introduce inline wrappers") from the slave-dma
> tree and commit c790d78c631f ("mxs-dma : rewrite the last parameter of
> mxs_dma_prep_slave_sg()") from the l2-mtd tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks like Vinod merged a lot of changes recently. Thanks for fixing
this up in linux-next!
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the l2-mtd tree with the slave-dma tree
2012-03-22 9:32 ` Artem Bityutskiy
@ 2012-03-26 6:18 ` Vinod Koul
0 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2012-03-26 6:18 UTC (permalink / raw)
To: dedekind1
Cc: Stephen Rothwell, linux-next, linux-kernel, Alexandre Bounine,
Huang Shijie
On Thu, 2012-03-22 at 11:32 +0200, Artem Bityutskiy wrote:
> On Thu, 2012-03-22 at 14:04 +1100, Stephen Rothwell wrote:
> > Hi Artem,
> >
> > Today's linux-next merge of the l2-mtd tree got a conflict in
> > drivers/mtd/nand/gpmi-nand/gpmi-lib.c between commit 16052827d98f
> > ("dmaengine/dma_slave: introduce inline wrappers") from the slave-dma
> > tree and commit c790d78c631f ("mxs-dma : rewrite the last parameter of
> > mxs_dma_prep_slave_sg()") from the l2-mtd tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> Looks like Vinod merged a lot of changes recently. Thanks for fixing
> this up in linux-next!
Thanks Again, loks right to me too.
Yes i had a pending series which I applied just before I went for
weekend.
--
~Vinod
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-26 6:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-22 3:04 linux-next: manual merge of the l2-mtd tree with the slave-dma tree Stephen Rothwell
2012-03-22 9:32 ` Artem Bityutskiy
2012-03-26 6:18 ` Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2012-03-22 2:53 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox