Patchwork Please fix or remove OMAP2 onenand driver

login
register
mail settings
Submitter Adrian Hunter
Date Nov. 24, 2008, 11:37 a.m.
Message ID <492A91E1.50305@nokia.com>
Download mbox | patch
Permalink /patch/10381/
State Accepted
Commit fe875358a6cd01c4599e321dd6dc767b11c42eac
Headers show

Comments

Adrian Hunter - Nov. 24, 2008, 11:37 a.m.
Russell King - ARM Linux wrote:
> Clearly this driver has been put into mainline prematurely - it takes
> no account of the relocation of headers.
> 
> It's causing a regression - omap_2430sdp_defconfig used to build in
> mainline, and it no longer does.
> 
> Please fix, or remove this broken driver from mainline.

From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Mon, 24 Nov 2008 13:34:53 +0200
Subject: [PATCH] MTD: OMAP: OneNAND: header file relocation

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
---
 drivers/mtd/onenand/omap2.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
Russell King - ARM Linux - Nov. 24, 2008, 12:01 p.m.
On Mon, Nov 24, 2008 at 01:37:05PM +0200, Adrian Hunter wrote:
> From: Adrian Hunter <ext-adrian.hunter@nokia.com>
> Date: Mon, 24 Nov 2008 13:34:53 +0200
> Subject: [PATCH] MTD: OMAP: OneNAND: header file relocation
> 
> Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>

Thanks.  Only two comments (see below).

> ---
> drivers/mtd/onenand/omap2.c |   12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
> index e39b21d..28034ef 100644
> --- a/drivers/mtd/onenand/omap2.c
> +++ b/drivers/mtd/onenand/omap2.c
> @@ -35,16 +35,16 @@
> 
> #include <asm/io.h>

Should be linux/io.h and should be with the other linux/ includes.

> #include <asm/mach/flash.h>
> -#include <asm/arch/gpmc.h>
> -#include <asm/arch/onenand.h>
> -#include <asm/arch/gpio.h>
> -#include <asm/arch/pm.h>
> +#include <mach/gpmc.h>
> +#include <mach/onenand.h>
> +#include <mach/gpio.h>
> +#include <mach/pm.h>
> 
> #include <linux/dma-mapping.h>
> #include <asm/dma-mapping.h>

asm/dma-mapping.h should not be included - only linux/dma-mapping.h, and
that should be up with the other linux/ includes.

> -#include <asm/arch/dma.h>
> +#include <mach/dma.h>
> 
> -#include <asm/arch/board.h>
> +#include <mach/board.h>
> 
> #define DRIVER_NAME "omap2-onenand"
> 
> -- 
> 1.5.4.3

Patch

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index e39b21d..28034ef 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -35,16 +35,16 @@ 
 
 #include <asm/io.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/onenand.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/pm.h>
+#include <mach/gpmc.h>
+#include <mach/onenand.h>
+#include <mach/gpio.h>
+#include <mach/pm.h>
 
 #include <linux/dma-mapping.h>
 #include <asm/dma-mapping.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #define DRIVER_NAME "omap2-onenand"