diff options
| author | pekon gupta <pekon@ti.com> | 2013-11-22 16:53:28 +0530 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-03-04 17:23:54 -0600 |
| commit | 51d192c40daa2b58cfc96c772799d9c632df33e3 (patch) | |
| tree | 818866b4e74cecdbac099e4fb68072ac238e1f82 /drivers/mtd | |
| parent | a7e36fc95fa2c915bb95e845c8945ca926575f5b (diff) | |
| download | talos-obmc-uboot-51d192c40daa2b58cfc96c772799d9c632df33e3.tar.gz talos-obmc-uboot-51d192c40daa2b58cfc96c772799d9c632df33e3.zip | |
mtd: nand: omap: merge duplicate GPMC data from different arch-xx headers into common omap_gpmc.h
Each SoC platform (AM33xx, OMAP3, OMAP4, OMAP5) has its own copy of GPMC related
defines and declarations scattered in SoC platform specific header files
like include/asm/arch-xx/cpu.h
However, GPMC hardware remains same across all platforms thus this patch merges
GPMC data scattered across different arch-xx specific header files into single
header file include/asm/arch/omap_gpmc.h
Build tested using: ./MAKEALL -s am33xx -s omap3 -s omap4 -s omap5
Signed-off-by: Pekon Gupta <pekon@ti.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/omap_elm.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap_gpmc.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c index 2aa7807f3e..64dca4fe98 100644 --- a/drivers/mtd/nand/omap_elm.c +++ b/drivers/mtd/nand/omap_elm.c @@ -16,9 +16,9 @@ #include <common.h> #include <asm/io.h> #include <asm/errno.h> -#include <asm/arch/cpu.h> #include <asm/omap_gpmc.h> #include <asm/omap_elm.h> +#include <asm/arch/hardware.h> #define ELM_DEFAULT_POLY (0) diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c index 441b32144f..b54e39e1cd 100644 --- a/drivers/mtd/nand/omap_gpmc.c +++ b/drivers/mtd/nand/omap_gpmc.c @@ -9,7 +9,6 @@ #include <asm/io.h> #include <asm/errno.h> #include <asm/arch/mem.h> -#include <asm/arch/cpu.h> #include <asm/omap_gpmc.h> #include <linux/mtd/nand_ecc.h> #include <linux/bch.h> |
