lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm: omap2plus: move NAND_BLOCK_SIZE out of boards

Browse Source 
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: Igor Grinberg <grinberg@compulab.co.il>
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Igor Grinberg
2011-05-30 00:11:45 -07:00
committed by Tony Lindgren
parent 4998b24573
commit 1704bf15de
8 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-cm-t35.c
View File

@@ -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>

3
arch/arm/mach-omap2/board-cm-t3517.c
View File

@@ -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",

2
arch/arm/mach-omap2/board-devkit8000.c
View File

@@ -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

2
arch/arm/mach-omap2/board-omap3beagle.c
View File

@@ -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.

2
arch/arm/mach-omap2/board-omap3pandora.c
View File

@@ -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",

2
arch/arm/mach-omap2/board-omap3touchbook.c
View File

@@ -56,8 +56,6 @@
#include <asm/setup.h> #include <asm/setup.h>
#define NAND_BLOCK_SIZE SZ_128K
#define OMAP3_AC_GPIO 136 #define OMAP3_AC_GPIO 136
#define OMAP3_TS_GPIO 162 #define OMAP3_TS_GPIO 162
#define TB_BL_PWM_TIMER 9 #define TB_BL_PWM_TIMER 9

2
arch/arm/mach-omap2/board-overo.c
View File

@@ -65,8 +65,6 @@
#define OVERO_GPIO_USBH_CPEN 168 #define OVERO_GPIO_USBH_CPEN 168
#define OVERO_GPIO_USBH_NRESET 183 #define OVERO_GPIO_USBH_NRESET 183
#define NAND_BLOCK_SIZE SZ_128K
#define OVERO_SMSC911X_CS 5 #define OVERO_SMSC911X_CS 5
#define OVERO_SMSC911X_GPIO 176 #define OVERO_SMSC911X_GPIO 176
#define OVERO_SMSC911X2_CS 4 #define OVERO_SMSC911X2_CS 4

2
arch/arm/mach-omap2/common-board-devices.h
View File

@@ -1,6 +1,8 @@
#ifndef __OMAP_COMMON_BOARD_DEVICES__ #ifndef __OMAP_COMMON_BOARD_DEVICES__
#define __OMAP_COMMON_BOARD_DEVICES__ #define __OMAP_COMMON_BOARD_DEVICES__
#define NAND_BLOCK_SIZE SZ_128K
struct twl4030_platform_data; struct twl4030_platform_data;
struct mtd_partition; struct mtd_partition;