mtd: nand: omap: move omap_gpmc.h from arch/arm/include/asm to drivers/mtd/nand

omap_gpmc.h is a generic header used by OMAP NAND driver for all TI platfoms.
Hence this file should be present in generic folder instead of architecture
specific include folder.
Build tested using: ./MAKEALL -s am33xx -s omap3 -s omap4 -s omap5

Signed-off-by: Pekon Gupta <pekon@ti.com>

diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h
index f73e285a899599456388305bc2a8e541eeb67855..91ff2ad0e4cd49b3f86df6ba2be439e92387beb6 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/sys_proto.h
+++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h
@@ -10,7 +10,7 @@
 
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_

-#include <asm/omap_gpmc.h>
+#include <linux/mtd/omap_gpmc.h>

 #include <asm/arch/cpu.h>
 
 #define BOARD_REV_ID   0x0
 #include <asm/arch/cpu.h>
 
 #define BOARD_REV_ID   0x0

diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 83d7f1146fdb324abf27882ffaf2c6103590323c..44fa66f8a389b91bf195b8c11fce016f7ffcf7a3 100644 (file)
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -7,7 +7,7 @@
  */
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
  */
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_

-#include <asm/omap_gpmc.h>
+#include <linux/mtd/omap_gpmc.h>

 
 typedef struct {
        u32 mtype;
 
 typedef struct {
        u32 mtype;

diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h
index ea8b72c431c0c846e7dacb48dc87c5bcd31b686a..b338a1566c6df3b02bc8c553ca1df7d23eca2991 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap4/sys_proto.h
@@ -12,7 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>

-#include <asm/omap_gpmc.h>
+#include <linux/mtd/omap_gpmc.h>

 #include <asm/arch/mux_omap4.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 #include <asm/arch/mux_omap4.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h
index 4247473a66697f6b793ba2b216e15bfdb3804694..9e007c87ae61217e2e784477362192e833db5b54 100644 (file)
--- a/arch/arm/include/asm/arch-omap5/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap5/sys_proto.h
@@ -12,7 +12,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/omap_common.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/omap_common.h>

-#include <asm/omap_gpmc.h>
+#include <linux/mtd/omap_gpmc.h>

 #include <asm/arch/clock.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 #include <asm/arch/clock.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 7a7500b342076476e98a25cc5e86892d543ce5ca..3b2b1f15b8e9647fe0fc72efee1e8f78fa11b588 100644 (file)
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -8,7 +8,6 @@
 #include <twl4030.h>
 #include <netdev.h>
 #include <asm/gpio.h>
 #include <twl4030.h>
 #include <netdev.h>
 #include <asm/gpio.h>

-#include <asm/omap_gpmc.h>

 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mmc_host_def.h>

diff --git a/board/overo/overo.c b/board/overo/overo.c
index 9ac35d2f4e331056bff1b1359b270688444e97c2..1192d02e9171ed99b52f3152cf86e3bab0e48d72 100644 (file)
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -21,7 +21,6 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>

-#include <asm/omap_gpmc.h>

 #include <asm/gpio.h>
 #include <asm/mach-types.h>
 #include "overo.h"
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
 #include "overo.h"

diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c
index 64dca4fe9831efdc01f466016889cdc000cd2908..55a631deb4a5f2ba728585fe336aa8fd03e44d2c 100644 (file)
--- a/drivers/mtd/nand/omap_elm.c
+++ b/drivers/mtd/nand/omap_elm.c
@@ -16,7 +16,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <common.h>
 #include <asm/io.h>
 #include <asm/errno.h>

-#include <asm/omap_gpmc.h>
+#include <linux/mtd/omap_gpmc.h>

 #include <asm/omap_elm.h>
 #include <asm/arch/hardware.h>
 
 #include <asm/omap_elm.h>
 #include <asm/arch/hardware.h>
 

diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
index b54e39e1cd5be28a8ac764197cb6cf90bb0133b0..452e40f04ef5301bbc547b3b5cddf8123d730e3d 100644 (file)
--- a/drivers/mtd/nand/omap_gpmc.c
+++ b/drivers/mtd/nand/omap_gpmc.c
@@ -9,7 +9,7 @@
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <asm/arch/mem.h>
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <asm/arch/mem.h>

-#include <asm/omap_gpmc.h>
+#include <linux/mtd/omap_gpmc.h>

 #include <linux/mtd/nand_ecc.h>
 #include <linux/bch.h>
 #include <linux/compiler.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/bch.h>
 #include <linux/compiler.h>

diff --git a/arch/arm/include/asm/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h
similarity index 100%
rename from arch/arm/include/asm/omap_gpmc.h
rename to include/linux/mtd/omap_gpmc.h