Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e639cd5b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Prepare to move GPMC to drivers by platform data header 



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: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6f8782a7

arch/arm/mach-omap2/board-am3517crane.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>

#include <linux/omap-gpmc.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-omap2/board-cm-t35.c

+1 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/input/matrix_keypad.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/omap-gpmc.h>

#include <linux/platform_data/gpio-omap.h>



#include <linux/platform_data/at24.h>
@@ -51,8 +52,6 @@ 
#include "sdram-micron-mt46h32m32lf-6.h"

#include "hsmmc.h"

#include "common-board-devices.h"

#include "gpmc.h"

#include "gpmc-nand.h"



#define CM_T35_GPIO_PENDOWN		57

#define SB_T35_USB_HUB_RESET_GPIO	167

arch/arm/mach-omap2/board-cm-t3517.c

+1 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/leds.h>

#include <linux/omap-gpmc.h>

#include <linux/rtc-v3020.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>
@@ -41,7 +42,6 @@ 


#include "common.h"

#include <linux/platform_data/mtd-nand-omap2.h>

#include "gpmc.h"



#include "am35xx.h"
@@ -50,7 +50,6 @@ 
#include "hsmmc.h"

#include "common-board-devices.h"

#include "am35xx-emac.h"

#include "gpmc-nand.h"



#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)

static struct gpio_led cm_t3517_leds[] = {

arch/arm/mach-omap2/board-flash.c

+1 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/omap-gpmc.h>

#include <linux/platform_device.h>

#include <linux/mtd/physmap.h>

#include <linux/io.h>
@@ -23,8 +24,6 @@ 
#include "soc.h"

#include "common.h"

#include "board-flash.h"

#include "gpmc-onenand.h"

#include "gpmc-nand.h"



#define REG_FPGA_REV			0x10

#define REG_FPGA_DIP_SWITCH_INPUT2	0x60

arch/arm/mach-omap2/board-flash.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
 */

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include "gpmc.h"



#define PDC_NOR		1

#define PDC_NAND	2