[PATCH 1/2] Blackfin NFC Driver: remove pointless return value in bf5xx_nand_dma_rw

[PATCH 1/2] Blackfin NFC Driver: remove pointless return value in bf5xx_nand_dma_rw

[Mike Frysinger]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
 drivers/mtd/nand/bf5xx_nand.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 4c2a67c..2ab42d2 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -458,7 +458,7 @@ static irqreturn_t bf5xx_nand_dma_irq(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int bf5xx_nand_dma_rw(struct mtd_info *mtd,
+static void bf5xx_nand_dma_rw(struct mtd_info *mtd,
 				uint8_t *buf, int is_read)
 {
 	struct bf5xx_nand_info *info = mtd_to_nand_info(mtd);
@@ -512,8 +512,6 @@ static int bf5xx_nand_dma_rw(struct mtd_info *mtd,
 	else
 		bfin_write_NFC_PGCTL(0x2);
 	wait_for_completion(&info->dma_completion);
-
-	return 0;
 }
 
 static void bf5xx_nand_dma_read_buf(struct mtd_info *mtd,
-- 
1.6.3.1

[PATCH 2/2] Blackfin NFC Driver: fix hang when using NAND on BF527-EZKITs

[Mike Frysinger]

From: Cliff Cai <cliff.cai@analog.com>

The DMAs have different bit sizes on BF52x and BF54x.  From the PHRM:

"The 16-bit DMA Access Bus (DAB) connects the DMA controller to the
on-chip peripherals, PPI, SPI, Ethernet MAC, the SPORTs, NFC,
HOSTDP and the UARTs."

32-bit DMA won't work for BF52x.

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
 drivers/mtd/nand/bf5xx_nand.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 2ab42d2..8506e7e 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -496,11 +496,20 @@ static void bf5xx_nand_dma_rw(struct mtd_info *mtd,
 	/* setup DMA register with Blackfin DMA API */
 	set_dma_config(CH_NFC, 0x0);
 	set_dma_start_addr(CH_NFC, (unsigned long) buf);
+
+/* The DMAs have different size on BF52x and BF54x */
+#ifdef CONFIG_BF52x
+	set_dma_x_count(CH_NFC, (page_size >> 1));
+	set_dma_x_modify(CH_NFC, 2);
+	val = DI_EN | WDSIZE_16;
+#endif
+
+#ifdef CONFIG_BF54x
 	set_dma_x_count(CH_NFC, (page_size >> 2));
 	set_dma_x_modify(CH_NFC, 4);
-
-	/* setup write or read operation */
 	val = DI_EN | WDSIZE_32;
+#endif
+	/* setup write or read operation */
 	if (is_read)
 		val |= WNR;
 	set_dma_config(CH_NFC, val);
-- 
1.6.3.1

Re: [PATCH 1/2] Blackfin NFC Driver: remove pointless return value in bf5xx_nand_dma_rw

[Artem Bityutskiy]

On Tue, 2009-05-26 at 06:24 -0400, Mike Frysinger wrote:
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> Signed-off-by: Bryan Wu <cooloney@kernel.org>
> ---
>  drivers/mtd/nand/bf5xx_nand.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)

I've taken these 2 patches to my l2-mtd-2.6.git.

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

Re: [PATCH 1/2] Blackfin NFC Driver: remove pointless return value in bf5xx_nand_dma_rw

[Mike Frysinger]

On Wed, May 27, 2009 at 10:46, Artem Bityutskiy wrote:
> On Tue, 2009-05-26 at 06:24 -0400, Mike Frysinger wrote:
>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>> Signed-off-by: Bryan Wu <cooloney@kernel.org>
>> ---
>>  drivers/mtd/nand/bf5xx_nand.c |    4 +---
>>  1 files changed, 1 insertions(+), 3 deletions(-)
>
> I've taken these 2 patches to my l2-mtd-2.6.git.

looks like a typo was made when you rewrote the subject line ?
http://git.infradead.org/users/dedekind/l2-mtd-2.6.git?a=commit;h=f6f3799ed7d93bbfef8fc96013a22121580ee233
"NFCr" rather than "NFC" ...
-mike

Re: [PATCH 1/2] Blackfin NFC Driver: remove pointless return value in bf5xx_nand_dma_rw

[Artem Bityutskiy]

On Mon, 2009-06-01 at 23:57 -0400, Mike Frysinger wrote:
> On Wed, May 27, 2009 at 10:46, Artem Bityutskiy wrote:
> > On Tue, 2009-05-26 at 06:24 -0400, Mike Frysinger wrote:
> >> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> >> Signed-off-by: Bryan Wu <cooloney@kernel.org>
> >> ---
> >>  drivers/mtd/nand/bf5xx_nand.c |    4 +---
> >>  1 files changed, 1 insertions(+), 3 deletions(-)
> >
> > I've taken these 2 patches to my l2-mtd-2.6.git.
> 
> looks like a typo was made when you rewrote the subject line ?
> http://git.infradead.org/users/dedekind/l2-mtd-2.6.git?a=commit;h=f6f3799ed7d93bbfef8fc96013a22121580ee233
> "NFCr" rather than "NFC" ...

Let me re-phrase it as "when you amended the subject line for
unification purposes". I'll fix that. This tree is anyway
throw-away. I'm just being an intelligent patchwork for dwmw2
in this case. :-)

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)