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

Commit 99f0b8d6 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers 

Conflicts:
	arch/arm/mach-omap2/board-3430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/pm34xx.c
	drivers/mtd/nand/omap2.c
	drivers/mtd/onenand/omap2.c
parents 94c65785 94709014

arch/arm/mach-omap2/board-2430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <asm/mach/map.h>



#include "common.h"

#include <plat/gpmc.h>

#include "gpmc.h"

#include <plat/usb.h>

#include "gpmc-smc91x.h"

arch/arm/mach-omap2/board-3430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ 
#include <plat/usb.h>

#include "common.h"

#include <plat-omap/dma-omap.h>

#include <plat/gpmc.h>

#include <video/omapdss.h>

#include <video/omap-panel-tfp410.h>



#include "gpmc.h"

#include "gpmc-smc91x.h"



#include "board-flash.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include <plat/led.h>

#include "common.h"

#include <plat/gpmc.h>

#include "gpmc.h"



#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>

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

+3 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


#include "common.h"

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

#include <plat/gpmc.h>

#include "gpmc.h"

#include <plat/usb.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>
@@ -53,6 +53,7 @@ 
#include "sdram-micron-mt46h32m32lf-6.h"

#include "hsmmc.h"

#include "common-board-devices.h"

#include "gpmc-nand.h"



#define CM_T35_GPIO_PENDOWN		57

#define SB_T35_USB_HUB_RESET_GPIO	167
@@ -181,7 +182,7 @@ static struct omap_nand_platform_data cm_t35_nand_data = { 


static void __init cm_t35_init_nand(void)

{

	if (gpmc_nand_init(&cm_t35_nand_data) < 0)

	if (gpmc_nand_init(&cm_t35_nand_data, NULL) < 0)

		pr_err("CM-T35: Unable to register NAND device\n");

}

#else

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

+3 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include "common.h"

#include <plat/usb.h>

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

#include <plat/gpmc.h>

#include "gpmc.h"



#include "am35xx.h"
@@ -49,6 +49,7 @@ 
#include "control.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[] = {
@@ -240,7 +241,7 @@ static struct omap_nand_platform_data cm_t3517_nand_data = { 


static void __init cm_t3517_init_nand(void)

{

	if (gpmc_nand_init(&cm_t3517_nand_data) < 0)

	if (gpmc_nand_init(&cm_t3517_nand_data, NULL) < 0)

		pr_err("CM-T3517: NAND initialization failed\n");

}

#else