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

Commit 1704bf15 authored by Igor Grinberg's avatar Igor Grinberg Committed by Tony Lindgren
Browse files

arm: omap2plus: move NAND_BLOCK_SIZE out of boards 



Several boards defining mtd partitions also defined NAND_BLOCK_SIZE as
SZ_128K. Move the define to common-board-devices.h

This removes multiple defines of NAND_BLOCK_SIZE.

Signed-off-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
[tony@atomide.com: updated comments]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4998b245

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -63,8 +63,6 @@ 
#define SB_T35_SMSC911X_CS	4

#define SB_T35_SMSC911X_CS	4

#define SB_T35_SMSC911X_GPIO	65

#define SB_T35_SMSC911X_GPIO	65





#define NAND_BLOCK_SIZE		SZ_128K



#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)

#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)

#include <linux/smsc911x.h>

#include <linux/smsc911x.h>

#include <plat/gpmc-smsc911x.h>

#include <plat/gpmc-smsc911x.h>

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ 




#include "mux.h"

#include "mux.h"

#include "control.h"

#include "control.h"

#include "common-board-devices.h"





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

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

static struct gpio_led cm_t3517_leds[] = {

static struct gpio_led cm_t3517_leds[] = {
@@ -203,8 +204,6 @@ static inline int cm_t3517_init_usbh(void) 
#endif

#endif





#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE)

#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE)

#define NAND_BLOCK_SIZE		SZ_128K



static struct mtd_partition cm_t3517_nand_partitions[] = {

static struct mtd_partition cm_t3517_nand_partitions[] = {

	{

	{

		.name           = "xloader",

		.name           = "xloader",

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -61,8 +61,6 @@ 
#include "timer-gp.h"

#include "timer-gp.h"

#include "common-board-devices.h"

#include "common-board-devices.h"





#define NAND_BLOCK_SIZE		SZ_128K



#define OMAP_DM9000_GPIO_IRQ	25

#define OMAP_DM9000_GPIO_IRQ	25

#define OMAP3_DEVKIT_TS_GPIO	27

#define OMAP3_DEVKIT_TS_GPIO	27

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -54,8 +54,6 @@ 
#include "pm.h"

#include "pm.h"

#include "common-board-devices.h"

#include "common-board-devices.h"





#define NAND_BLOCK_SIZE		SZ_128K



/*

/*

 * OMAP3 Beagle revision

 * OMAP3 Beagle revision

 * Run time detection of Beagle revision is done by reading GPIO.

 * Run time detection of Beagle revision is done by reading GPIO.

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,6 @@ 
#define PANDORA_WIFI_NRESET_GPIO	23

#define PANDORA_WIFI_NRESET_GPIO	23

#define OMAP3_PANDORA_TS_GPIO		94

#define OMAP3_PANDORA_TS_GPIO		94





#define NAND_BLOCK_SIZE			SZ_128K



static struct mtd_partition omap3pandora_nand_partitions[] = {

static struct mtd_partition omap3pandora_nand_partitions[] = {

	{

	{

		.name           = "xloader",

		.name           = "xloader",