Re: [patch 2.6.27-rc3-omap1] omap3 beagle: nand (mostly) cleanups
* Woodruff, Richard [EMAIL PROTECTED] [080902 10:33]:
Hi,
From: David Brownell [mailto:[EMAIL PROTECTED]
Actually, this was talked about before a bit and the
SZ_xyz flags were left out.
The point of telling the geometry in the addition was
to be explicit about the number of sectors being used.
So ... this instead?
Yes that looks good thanks.
Pushing these three beagle patches today.
Tony
Signed-off-by: David Brownell [EMAIL PROTECTED]
Acked-by: Richard Woodruff [EMAIL PROTECTED]
---
arch/arm/mach-omap2/board-omap3beagle.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -42,32 +42,35 @@
#include mach/gpmc.h
#include mach/nand.h
+
#define GPMC_CS0_BASE 0x60
#define GPMC_CS_SIZE 0x30
+#define NAND_BLOCK_SIZE SZ_128K
+
static struct mtd_partition omap3beagle_nand_partitions[] = {
/* All the partition sizes are listed in terms of NAND block size
*/
{
.name = X-Loader,
.offset = 0,
- .size = 4*(64 * 2048),
+ .size = 4 * NAND_BLOCK_SIZE,
.mask_flags = MTD_WRITEABLE,/* force read-only */
},
{
.name = U-Boot,
.offset = MTDPART_OFS_APPEND, /* Offset =
0x8 */
- .size = 15*(64 * 2048),
+ .size = 15 * NAND_BLOCK_SIZE,
.mask_flags = MTD_WRITEABLE,/* force read-only */
},
{
.name = U-Boot Env,
.offset = MTDPART_OFS_APPEND, /* Offset =
0x26 */
- .size = 1*(64 * 2048),
+ .size = 1 * NAND_BLOCK_SIZE,
},
{
.name = Kernel,
.offset = MTDPART_OFS_APPEND, /* Offset =
0x28 */
- .size = 32*(64 * 2048),
+ .size = 32 * NAND_BLOCK_SIZE,
},
{
.name = File System,
@@ -77,6 +80,7 @@ static struct mtd_partition omap3beagle_
};
static struct omap_nand_platform_data omap3beagle_nand_data = {
+ .options= NAND_BUSWIDTH_16,
.parts = omap3beagle_nand_partitions,
.nr_parts = ARRAY_SIZE(omap3beagle_nand_partitions),
.dma_channel= -1, /* disable DMA in OMAP NAND driver
*/
@@ -205,7 +209,7 @@ static struct platform_device *omap3_bea
keys_gpio,
};
-void __init omap3beagle_flash_init(void)
+static void __init omap3beagle_flash_init(void)
{
u8 cs = 0;
u8 nandcs = GPMC_CS_NUM + 1;
@@ -245,6 +249,7 @@ void __init omap3beagle_flash_init(void)
static void __init omap3_beagle_init(void)
{
+ omap3_beagle_i2c_init();
platform_add_devices(omap3_beagle_devices,
ARRAY_SIZE(omap3_beagle_devices));
omap_board_config = omap3_beagle_config;
omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
@@ -255,8 +260,6 @@ static void __init omap3_beagle_init(voi
omap3beagle_flash_init();
}
-arch_initcall(omap3_beagle_i2c_init);
-
static void __init omap3_beagle_map_io(void)
{
omap2_set_globals_343x();
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 2.6.27-rc3-omap1] omap3 beagle: nand (mostly) cleanups
On Friday 29 August 2008, Woodruff, Richard wrote:
Actually, this was talked about before a bit and the
SZ_xyz flags were left out.
The point of telling the geometry in the addition was
to be explicit about the number of sectors being used.
So ... this instead?
=== CUT HERE
From: David Brownell [EMAIL PROTECTED]
Clean up the Beagle NAND config a bit: use SZ_128K instead of
an arithmetic expression for the NAND block size. Set the
NAND_BUSWIDTH_16 flag. Make its init routine static.
(Unrelated: make omap3_beagle_i2c_init be part of beagle_init.
It shouldn't be called on non-beagle hardware; and beagle_init
already runs with other arch_initcall code.)
Signed-off-by: David Brownell [EMAIL PROTECTED]
---
arch/arm/mach-omap2/board-omap3beagle.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -42,32 +42,35 @@
#include mach/gpmc.h
#include mach/nand.h
+
#define GPMC_CS0_BASE 0x60
#define GPMC_CS_SIZE 0x30
+#define NAND_BLOCK_SIZESZ_128K
+
static struct mtd_partition omap3beagle_nand_partitions[] = {
/* All the partition sizes are listed in terms of NAND block size */
{
.name = X-Loader,
.offset = 0,
- .size = 4*(64 * 2048),
+ .size = 4 * NAND_BLOCK_SIZE,
.mask_flags = MTD_WRITEABLE,/* force read-only */
},
{
.name = U-Boot,
.offset = MTDPART_OFS_APPEND, /* Offset = 0x8 */
- .size = 15*(64 * 2048),
+ .size = 15 * NAND_BLOCK_SIZE,
.mask_flags = MTD_WRITEABLE,/* force read-only */
},
{
.name = U-Boot Env,
.offset = MTDPART_OFS_APPEND, /* Offset = 0x26 */
- .size = 1*(64 * 2048),
+ .size = 1 * NAND_BLOCK_SIZE,
},
{
.name = Kernel,
.offset = MTDPART_OFS_APPEND, /* Offset = 0x28 */
- .size = 32*(64 * 2048),
+ .size = 32 * NAND_BLOCK_SIZE,
},
{
.name = File System,
@@ -77,6 +80,7 @@ static struct mtd_partition omap3beagle_
};
static struct omap_nand_platform_data omap3beagle_nand_data = {
+ .options= NAND_BUSWIDTH_16,
.parts = omap3beagle_nand_partitions,
.nr_parts = ARRAY_SIZE(omap3beagle_nand_partitions),
.dma_channel= -1, /* disable DMA in OMAP NAND driver */
@@ -205,7 +209,7 @@ static struct platform_device *omap3_bea
keys_gpio,
};
-void __init omap3beagle_flash_init(void)
+static void __init omap3beagle_flash_init(void)
{
u8 cs = 0;
u8 nandcs = GPMC_CS_NUM + 1;
@@ -245,6 +249,7 @@ void __init omap3beagle_flash_init(void)
static void __init omap3_beagle_init(void)
{
+ omap3_beagle_i2c_init();
platform_add_devices(omap3_beagle_devices,
ARRAY_SIZE(omap3_beagle_devices));
omap_board_config = omap3_beagle_config;
omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
@@ -255,8 +260,6 @@ static void __init omap3_beagle_init(voi
omap3beagle_flash_init();
}
-arch_initcall(omap3_beagle_i2c_init);
-
static void __init omap3_beagle_map_io(void)
{
omap2_set_globals_343x();
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [patch 2.6.27-rc3-omap1] omap3 beagle: nand (mostly) cleanups
Hi,
From: David Brownell [mailto:[EMAIL PROTECTED]
Actually, this was talked about before a bit and the
SZ_xyz flags were left out.
The point of telling the geometry in the addition was
to be explicit about the number of sectors being used.
So ... this instead?
Yes that looks good thanks.
Signed-off-by: David Brownell [EMAIL PROTECTED]
Acked-by: Richard Woodruff [EMAIL PROTECTED]
---
arch/arm/mach-omap2/board-omap3beagle.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -42,32 +42,35 @@
#include mach/gpmc.h
#include mach/nand.h
+
#define GPMC_CS0_BASE 0x60
#define GPMC_CS_SIZE 0x30
+#define NAND_BLOCK_SIZE SZ_128K
+
static struct mtd_partition omap3beagle_nand_partitions[] = {
/* All the partition sizes are listed in terms of NAND block size
*/
{
.name = X-Loader,
.offset = 0,
- .size = 4*(64 * 2048),
+ .size = 4 * NAND_BLOCK_SIZE,
.mask_flags = MTD_WRITEABLE,/* force read-only */
},
{
.name = U-Boot,
.offset = MTDPART_OFS_APPEND, /* Offset =
0x8 */
- .size = 15*(64 * 2048),
+ .size = 15 * NAND_BLOCK_SIZE,
.mask_flags = MTD_WRITEABLE,/* force read-only */
},
{
.name = U-Boot Env,
.offset = MTDPART_OFS_APPEND, /* Offset =
0x26 */
- .size = 1*(64 * 2048),
+ .size = 1 * NAND_BLOCK_SIZE,
},
{
.name = Kernel,
.offset = MTDPART_OFS_APPEND, /* Offset =
0x28 */
- .size = 32*(64 * 2048),
+ .size = 32 * NAND_BLOCK_SIZE,
},
{
.name = File System,
@@ -77,6 +80,7 @@ static struct mtd_partition omap3beagle_
};
static struct omap_nand_platform_data omap3beagle_nand_data = {
+ .options= NAND_BUSWIDTH_16,
.parts = omap3beagle_nand_partitions,
.nr_parts = ARRAY_SIZE(omap3beagle_nand_partitions),
.dma_channel= -1, /* disable DMA in OMAP NAND driver
*/
@@ -205,7 +209,7 @@ static struct platform_device *omap3_bea
keys_gpio,
};
-void __init omap3beagle_flash_init(void)
+static void __init omap3beagle_flash_init(void)
{
u8 cs = 0;
u8 nandcs = GPMC_CS_NUM + 1;
@@ -245,6 +249,7 @@ void __init omap3beagle_flash_init(void)
static void __init omap3_beagle_init(void)
{
+ omap3_beagle_i2c_init();
platform_add_devices(omap3_beagle_devices,
ARRAY_SIZE(omap3_beagle_devices));
omap_board_config = omap3_beagle_config;
omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
@@ -255,8 +260,6 @@ static void __init omap3_beagle_init(voi
omap3beagle_flash_init();
}
-arch_initcall(omap3_beagle_i2c_init);
-
static void __init omap3_beagle_map_io(void)
{
omap2_set_globals_343x();
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 2.6.27-rc3-omap1] omap3 beagle: nand (mostly) cleanups
On Tue, Sep 2, 2008 at 10:23 AM, David Brownell [EMAIL PROTECTED] wrote: (Unrelated: make omap3_beagle_i2c_init be part of beagle_init. It shouldn't be called on non-beagle hardware; and beagle_init already runs with other arch_initcall code.) Good catch, I will do the same on the Overo board file. Steve -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [patch 2.6.27-rc3-omap1] omap3 beagle: nand (mostly) cleanups
On Friday 29 August 2008, Woodruff, Richard wrote: Clean up the Beagle NAND config a bit: use SZ_128K instead of an arithmetic expression for the NAND block size. Set the NAND_BUSWIDTH_16 flag. Make its init routine static. Actually, this was talked about before a bit and the SZ_xyz flags were left out. The point of telling the geometry in the addition was to be explicit about the number of sectors being used. So #define NAND_BLOCK_SIZE SZ_128K and use that symbol instead? Frankly N*(64 * 2048) isn't very meaningful. The comment at the top already says everything is in units of blocks, but one is left to guess that block is (64 * 2048)... -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
