| Message ID | 1285364702-13922-1-git-send-email-loic.minier@linaro.org |
|---|---|
| State | Accepted |
| Commit | f12f662f29d5801e598c6bb4a71e54b2de218f72 |
| Headers | show |
> -----Original Message----- > From: Loïc Minier [mailto:loic.minier@linaro.org] > Sent: Saturday, September 25, 2010 3:15 AM > To: linux-mtd@lists.infradead.org; linux-omap@vger.kernel.org > Cc: Tony Lindgren; Ghorai, Sukumar; Loïc Minier > Subject: [PATCH] nand: omap2: Missing arg to gpmc_prefetch_reset() > > Fix missing cs arg to gpmc_prefetch_reset() when > CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y which caused a build failure since > 948d38e799f0ab87cf8ed9113fcdaaee61acf321: > drivers/mtd/nand/omap2.c: In function 'omap_nand_dma_transfer': > drivers/mtd/nand/omap2.c:416: error: too few arguments to function > 'gpmc_prefetch_reset' > > Signed-off-by: Loïc Minier <loic.minier@linaro.org> > --- > drivers/mtd/nand/omap2.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c > index 133d515..513e0a7 100644 > --- a/drivers/mtd/nand/omap2.c > +++ b/drivers/mtd/nand/omap2.c > @@ -413,7 +413,7 @@ static inline int omap_nand_dma_transfer(struct > mtd_info *mtd, void *addr, > prefetch_status = gpmc_read_status(GPMC_PREFETCH_COUNT); > } while (prefetch_status); > /* disable and stop the PFPW engine */ > - gpmc_prefetch_reset(); > + gpmc_prefetch_reset(info->gpmc_cs); > > dma_unmap_single(&info->pdev->dev, dma_addr, len, dir); > return 0; > -- > 1.7.1 [Ghorai] Acked-by: Sukumar Ghorai <s-ghorai@ti.com>
On Fri, 2010-09-24 at 23:45 +0200, Loïc Minier wrote: > Fix missing cs arg to gpmc_prefetch_reset() when > CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y which caused a build failure since > 948d38e799f0ab87cf8ed9113fcdaaee61acf321: > drivers/mtd/nand/omap2.c: In function 'omap_nand_dma_transfer': > drivers/mtd/nand/omap2.c:416: error: too few arguments to function 'gpmc_prefetch_reset' > > Signed-off-by: Loïc Minier <loic.minier@linaro.org> Looks like a regression which should be merged to 2.6.36. I've taken this patch to l2-mtd-2.6.git, will ping dwmw2 about the need to merge this to 2.6.36.
On Fri, 2010-09-24 at 23:45 +0200, Loïc Minier wrote: > Fix missing cs arg to gpmc_prefetch_reset() when > CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y which caused a build failure since > 948d38e799f0ab87cf8ed9113fcdaaee61acf321: > drivers/mtd/nand/omap2.c: In function 'omap_nand_dma_transfer': > drivers/mtd/nand/omap2.c:416: error: too few arguments to function 'gpmc_prefetch_reset' > > Signed-off-by: Loïc Minier <loic.minier@linaro.org> > --- > drivers/mtd/nand/omap2.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) FYI, a similar patch is already in Linus' tree, so I'm dropping it from my tree: commit f12f662f29d5801e598c6bb4a71e54b2de218f72 Author: Daniel J Blueman <daniel.blueman@gmail.com> Date: Wed Sep 29 21:01:55 2010 +0100 fix OMAP2 MTD build failure Fix build failure from recent interface change and merge. Tested on OMAP3430. Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
On Mon, Oct 04, 2010, Artem Bityutskiy wrote: > FYI, a similar patch is already in Linus' tree, so I'm dropping it from > my tree Ok, thanks; is there something I should have done to get this patch into Linus tree?
On Mon, 2010-10-04 at 10:52 +0200, Loïc Minier wrote: > On Mon, Oct 04, 2010, Artem Bityutskiy wrote: > > FYI, a similar patch is already in Linus' tree, so I'm dropping it from > > my tree > > Ok, thanks; is there something I should have done to get this patch > into Linus tree? No, you did everything right. I guess that guy was just faster than you.
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 133d515..513e0a7 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -413,7 +413,7 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr, prefetch_status = gpmc_read_status(GPMC_PREFETCH_COUNT); } while (prefetch_status); /* disable and stop the PFPW engine */ - gpmc_prefetch_reset(); + gpmc_prefetch_reset(info->gpmc_cs); dma_unmap_single(&info->pdev->dev, dma_addr, len, dir); return 0;
Fix missing cs arg to gpmc_prefetch_reset() when CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y which caused a build failure since 948d38e799f0ab87cf8ed9113fcdaaee61acf321: drivers/mtd/nand/omap2.c: In function 'omap_nand_dma_transfer': drivers/mtd/nand/omap2.c:416: error: too few arguments to function 'gpmc_prefetch_reset' Signed-off-by: Loïc Minier <loic.minier@linaro.org> --- drivers/mtd/nand/omap2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)