ARM: OMAP2+: Prepare to move GPMC to drivers by platform data header
authorTony Lindgren <tony@atomide.com>
Thu, 20 Nov 2014 20:11:25 +0000 (12:11 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 20 Nov 2014 20:11:25 +0000 (12:11 -0800)
We still need to support platform data for omap3 until it's booting
in device tree only mode. So let's add platform_data/omap-gpmc.h for
that, and a minimal linux/omap-gpmc.h for the save and restore used
by the PM code.

Let's also keep a minimal mach-omap2/gpmc.h still around to avoid
churn on the board-*.c files. Once omap3 boots in device tree only
mode, we can drop mach-omap2/gpmc.h and we can make the data
structures in platform_data/omap-gpmc.h private to the GPMC driver.

Note that we can now also remove gpmc-nand.h and gpmc-onenand.h.

Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
16 files changed:
arch/arm/mach-omap2/board-am3517crane.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-cm-t3517.c
arch/arm/mach-omap2/board-flash.c
arch/arm/mach-omap2/board-flash.h
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/gpmc-nand.c
arch/arm/mach-omap2/gpmc-nand.h [deleted file]
arch/arm/mach-omap2/gpmc-onenand.c
arch/arm/mach-omap2/gpmc-onenand.h [deleted file]
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/gpmc.h
arch/arm/mach-omap2/pm34xx.c
include/linux/omap-gpmc.h [new file with mode: 0644]

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc arch/arm/mach-omap2/gpmc-nand.h
Simple merge
Simple merge
diff --cc arch/arm/mach-omap2/gpmc-onenand.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge