From: Igor Grinberg <grinberg@compulab.co.il>
To: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tony Lindgren <tony@atomide.com>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] arm: omap2plus: move NAND_BLOCK_SIZE out of boards
Date: Wed, 11 May 2011 11:37:24 +0300 [thread overview]
Message-ID: <4DCA4AC4.10002@compulab.co.il> (raw)
In-Reply-To: <1305099827-19832-1-git-send-email-grinberg@compulab.co.il>
Please, ignore this,
I have another idea which I will send in the near future.
Sorry for the noise...
On 05/11/11 10:43, Igor Grinberg wrote:
> Each board defining mtd partitions also defined NAND_BLOCK_SIZE as
> SZ_128K. Move the define to common-board-devices.h
>
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> ---
> arch/arm/mach-omap2/board-cm-t35.c | 2 --
> arch/arm/mach-omap2/board-cm-t3517.c | 2 --
> arch/arm/mach-omap2/board-devkit8000.c | 2 --
> arch/arm/mach-omap2/board-omap3beagle.c | 2 --
> arch/arm/mach-omap2/board-omap3pandora.c | 2 --
> arch/arm/mach-omap2/board-omap3touchbook.c | 2 --
> arch/arm/mach-omap2/board-overo.c | 2 --
> arch/arm/mach-omap2/common-board-devices.h | 3 +++
> 8 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
> index e0e2d48..4727a99 100644
> --- a/arch/arm/mach-omap2/board-cm-t35.c
> +++ b/arch/arm/mach-omap2/board-cm-t35.c
> @@ -63,8 +63,6 @@
> #define SB_T35_SMSC911X_CS 4
> #define SB_T35_SMSC911X_GPIO 65
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
> #include <linux/smsc911x.h>
> #include <plat/gpmc-smsc911x.h>
> diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c
> index a27e3ee..7699eb6 100644
> --- a/arch/arm/mach-omap2/board-cm-t3517.c
> +++ b/arch/arm/mach-omap2/board-cm-t3517.c
> @@ -204,8 +204,6 @@ static inline int cm_t3517_init_usbh(void)
> #endif
>
> #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[] = {
> {
> .name = "xloader",
> diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
> index 405542a..ddcdca8 100644
> --- a/arch/arm/mach-omap2/board-devkit8000.c
> +++ b/arch/arm/mach-omap2/board-devkit8000.c
> @@ -61,8 +61,6 @@
> #include "timer-gp.h"
> #include "common-board-devices.h"
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> #define OMAP_DM9000_GPIO_IRQ 25
> #define OMAP3_DEVKIT_TS_GPIO 27
>
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index bc30ab0..039b904 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -54,8 +54,6 @@
> #include "pm.h"
> #include "common-board-devices.h"
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> /*
> * OMAP3 Beagle revision
> * Run time detection of Beagle revision is done by reading GPIO.
> diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
> index 6c22d3f..439920f 100644
> --- a/arch/arm/mach-omap2/board-omap3pandora.c
> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
> @@ -57,8 +57,6 @@
> #define PANDORA_WIFI_NRESET_GPIO 23
> #define OMAP3_PANDORA_TS_GPIO 94
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> static struct mtd_partition omap3pandora_nand_partitions[] = {
> {
> .name = "xloader",
> diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
> index 392278d..c655a81 100644
> --- a/arch/arm/mach-omap2/board-omap3touchbook.c
> +++ b/arch/arm/mach-omap2/board-omap3touchbook.c
> @@ -56,8 +56,6 @@
>
> #include <asm/setup.h>
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> #define OMAP3_AC_GPIO 136
> #define OMAP3_TS_GPIO 162
> #define TB_BL_PWM_TIMER 9
> diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
> index e152c13..42656a2 100644
> --- a/arch/arm/mach-omap2/board-overo.c
> +++ b/arch/arm/mach-omap2/board-overo.c
> @@ -65,8 +65,6 @@
> #define OVERO_GPIO_USBH_CPEN 168
> #define OVERO_GPIO_USBH_NRESET 183
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> #define OVERO_SMSC911X_CS 5
> #define OVERO_SMSC911X_GPIO 176
> #define OVERO_SMSC911X2_CS 4
> diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h
> index eb80b3b..5a3c414 100644
> --- a/arch/arm/mach-omap2/common-board-devices.h
> +++ b/arch/arm/mach-omap2/common-board-devices.h
> @@ -30,6 +30,9 @@ struct ads7846_platform_data;
>
> void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
> struct ads7846_platform_data *board_pdata);
> +
> +#define NAND_BLOCK_SIZE SZ_128K
> +
> void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts);
>
> #endif /* __OMAP_COMMON_BOARD_DEVICES__ */
--
Regards,
Igor.
WARNING: multiple messages have this Message-ID (diff)
From: grinberg@compulab.co.il (Igor Grinberg)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: omap2plus: move NAND_BLOCK_SIZE out of boards
Date: Wed, 11 May 2011 11:37:24 +0300 [thread overview]
Message-ID: <4DCA4AC4.10002@compulab.co.il> (raw)
In-Reply-To: <1305099827-19832-1-git-send-email-grinberg@compulab.co.il>
Please, ignore this,
I have another idea which I will send in the near future.
Sorry for the noise...
On 05/11/11 10:43, Igor Grinberg wrote:
> Each board defining mtd partitions also defined NAND_BLOCK_SIZE as
> SZ_128K. Move the define to common-board-devices.h
>
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> ---
> arch/arm/mach-omap2/board-cm-t35.c | 2 --
> arch/arm/mach-omap2/board-cm-t3517.c | 2 --
> arch/arm/mach-omap2/board-devkit8000.c | 2 --
> arch/arm/mach-omap2/board-omap3beagle.c | 2 --
> arch/arm/mach-omap2/board-omap3pandora.c | 2 --
> arch/arm/mach-omap2/board-omap3touchbook.c | 2 --
> arch/arm/mach-omap2/board-overo.c | 2 --
> arch/arm/mach-omap2/common-board-devices.h | 3 +++
> 8 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
> index e0e2d48..4727a99 100644
> --- a/arch/arm/mach-omap2/board-cm-t35.c
> +++ b/arch/arm/mach-omap2/board-cm-t35.c
> @@ -63,8 +63,6 @@
> #define SB_T35_SMSC911X_CS 4
> #define SB_T35_SMSC911X_GPIO 65
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
> #include <linux/smsc911x.h>
> #include <plat/gpmc-smsc911x.h>
> diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c
> index a27e3ee..7699eb6 100644
> --- a/arch/arm/mach-omap2/board-cm-t3517.c
> +++ b/arch/arm/mach-omap2/board-cm-t3517.c
> @@ -204,8 +204,6 @@ static inline int cm_t3517_init_usbh(void)
> #endif
>
> #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[] = {
> {
> .name = "xloader",
> diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
> index 405542a..ddcdca8 100644
> --- a/arch/arm/mach-omap2/board-devkit8000.c
> +++ b/arch/arm/mach-omap2/board-devkit8000.c
> @@ -61,8 +61,6 @@
> #include "timer-gp.h"
> #include "common-board-devices.h"
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> #define OMAP_DM9000_GPIO_IRQ 25
> #define OMAP3_DEVKIT_TS_GPIO 27
>
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index bc30ab0..039b904 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -54,8 +54,6 @@
> #include "pm.h"
> #include "common-board-devices.h"
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> /*
> * OMAP3 Beagle revision
> * Run time detection of Beagle revision is done by reading GPIO.
> diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
> index 6c22d3f..439920f 100644
> --- a/arch/arm/mach-omap2/board-omap3pandora.c
> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
> @@ -57,8 +57,6 @@
> #define PANDORA_WIFI_NRESET_GPIO 23
> #define OMAP3_PANDORA_TS_GPIO 94
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> static struct mtd_partition omap3pandora_nand_partitions[] = {
> {
> .name = "xloader",
> diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
> index 392278d..c655a81 100644
> --- a/arch/arm/mach-omap2/board-omap3touchbook.c
> +++ b/arch/arm/mach-omap2/board-omap3touchbook.c
> @@ -56,8 +56,6 @@
>
> #include <asm/setup.h>
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> #define OMAP3_AC_GPIO 136
> #define OMAP3_TS_GPIO 162
> #define TB_BL_PWM_TIMER 9
> diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
> index e152c13..42656a2 100644
> --- a/arch/arm/mach-omap2/board-overo.c
> +++ b/arch/arm/mach-omap2/board-overo.c
> @@ -65,8 +65,6 @@
> #define OVERO_GPIO_USBH_CPEN 168
> #define OVERO_GPIO_USBH_NRESET 183
>
> -#define NAND_BLOCK_SIZE SZ_128K
> -
> #define OVERO_SMSC911X_CS 5
> #define OVERO_SMSC911X_GPIO 176
> #define OVERO_SMSC911X2_CS 4
> diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h
> index eb80b3b..5a3c414 100644
> --- a/arch/arm/mach-omap2/common-board-devices.h
> +++ b/arch/arm/mach-omap2/common-board-devices.h
> @@ -30,6 +30,9 @@ struct ads7846_platform_data;
>
> void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
> struct ads7846_platform_data *board_pdata);
> +
> +#define NAND_BLOCK_SIZE SZ_128K
> +
> void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts);
>
> #endif /* __OMAP_COMMON_BOARD_DEVICES__ */
--
Regards,
Igor.
next prev parent reply other threads:[~2011-05-11 8:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 7:43 [PATCH] arm: omap2plus: move NAND_BLOCK_SIZE out of boards Igor Grinberg
2011-05-11 7:43 ` Igor Grinberg
2011-05-11 8:37 ` Igor Grinberg [this message]
2011-05-11 8:37 ` Igor Grinberg
2011-05-15 11:38 ` [PATCH v2] " Igor Grinberg
2011-05-15 11:38 ` Igor Grinberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DCA4AC4.10002@compulab.co.il \
--to=grinberg@compulab.co.il \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.