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

Commit bc3668ea authored by Afzal Mohammed's avatar Afzal Mohammed
Browse files

ARM: OMAP2+: nand: header cleanup 



For common arm zImage existing nand header file
in platform specific location was moved to generic
platform data location, but it contained more than
platform data, remove it. New local header has been
created for exposing functions.

Also move gpmc-nand platform data to platform header
meant for nand from gpmc header file

Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
parent b6ab13e7

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

+2 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#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
@@ -139,10 +140,9 @@ __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs, 
	board_nand_data.parts		= nand_parts;

	board_nand_data.nr_parts	= nr_parts;

	board_nand_data.devsize		= nand_type;

	board_nand_data.gpmc_t		= gpmc_t;



	board_nand_data.ecc_opt = OMAP_ECC_HAMMING_CODE_DEFAULT;

	gpmc_nand_init(&board_nand_data);

	gpmc_nand_init(&board_nand_data, gpmc_t);

}

#endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */

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

+2 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "sdram-micron-mt46h32m32lf-6.h"

#include "hsmmc.h"

#include "common-board-devices.h"

#include "gpmc-nand.h"



#define PANDORA_WIFI_IRQ_GPIO		21

#define PANDORA_WIFI_NRESET_GPIO	23
@@ -602,7 +603,7 @@ static void __init omap3pandora_init(void) 
	omap_ads7846_init(1, OMAP3_PANDORA_TS_GPIO, 0, NULL);

	usbhs_init(&usbhs_bdata);

	usb_musb_init(NULL);

	gpmc_nand_init(&pandora_nand_data);

	gpmc_nand_init(&pandora_nand_data, NULL);



	/* Ensure SDRC pins are mux'd for self-refresh */

	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);

arch/arm/mach-omap2/common-board-devices.c

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



#include <linux/platform_data/spi-omap2-mcspi.h>

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



#include "common.h"

#include "common-board-devices.h"