* [PATCH 1/1] Adding support for NAND partitions in OMAP3 EVM.
@ 2008-11-28 5:36 Manikandan Pillai
2009-01-08 14:56 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Manikandan Pillai @ 2008-11-28 5:36 UTC (permalink / raw)
To: linux-omap; +Cc: Manikandan Pillai
Flash initialization has been modified to take care on NAND initialization
and creation of NAND partitions.
Signed-off-by: Manikandan Pillai <mani.pillai@ti.com>
---
arch/arm/mach-omap2/board-omap3evm-flash.c | 85 ++++++++++++++++++++--
arch/arm/plat-omap/include/mach/board-omap3evm.h | 2 +
2 files changed, 82 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3evm-flash.c b/arch/arm/mach-omap2/board-omap3evm-flash.c
index 5f3663d..72c7f5b 100644
--- a/arch/arm/mach-omap2/board-omap3evm-flash.c
+++ b/arch/arm/mach-omap2/board-omap3evm-flash.c
@@ -23,6 +23,9 @@
#include <mach/gpmc.h>
#include <mach/nand.h>
+#define GPMC_CS0_BASE 0x60
+#define GPMC_CS_SIZE 0x30
+
static int omap3evm_onenand_setup(void __iomem *, int freq);
static struct mtd_partition omap3evm_onenand_partitions[] = {
@@ -70,6 +73,63 @@ static struct platform_device omap3evm_onenand_device = {
},
};
+static struct mtd_partition omap3evm_nand_partitions[] = {
+ /* All the partition sizes are listed in terms of NAND block size */
+ {
+ .name = "X-Loader-NAND",
+ .offset = 0,
+ .size = 4*(128 * 1024),
+ .mask_flags = MTD_WRITEABLE, /* force read-only */
+ },
+ {
+ .name = "U-Boot-NAND",
+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */
+ .size = 14*(128 * 1024),
+ .mask_flags = MTD_WRITEABLE, /* force read-only */
+ },
+ {
+ .name = "Boot Env-NAND",
+
+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x100000 */
+ .size = 2*(128 * 1024),
+ },
+ {
+ .name = "Kernel-NAND",
+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x140000 */
+ .size = 40*(128 * 1024),
+ },
+ {
+ .name = "File System - NAND",
+ .size = MTDPART_SIZ_FULL,
+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x540000 */
+ },
+};
+
+/* dip switches control NAND chip access: 8 bit, 16 bit, or neither */
+static struct omap_nand_platform_data omap3evm_nand_data = {
+ .parts = omap3evm_nand_partitions,
+ .nr_parts = ARRAY_SIZE(omap3evm_nand_partitions),
+ .nand_setup = NULL,
+ .dma_channel = -1, /* disable DMA in OMAP NAND driver */
+ .dev_ready = NULL,
+ .options = NAND_SAMSUNG_LP_OPTIONS,
+};
+
+static struct resource omap3evm_nand_resource = {
+ .flags = IORESOURCE_MEM,
+};
+
+static struct platform_device omap3evm_nand_device = {
+ .name = "omap2-nand",
+ .id = 0,
+ .dev = {
+ .platform_data = &omap3evm_nand_data,
+ },
+ .num_resources = 1,
+ .resource = &omap3evm_nand_resource,
+};
+
+
/*
* omap3evm_onenand_setup - Set the onenand sync mode
* @onenand_base: The onenand base address in GPMC memory map
@@ -86,6 +146,8 @@ void __init omap3evm_flash_init(void)
{
u8 cs = 0;
u8 onenandcs = GPMC_CS_NUM + 1;
+ u8 nandcs = GPMC_CS_NUM + 1;
+ u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;
while (cs < GPMC_CS_NUM) {
u32 ret = 0;
@@ -100,18 +162,31 @@ void __init omap3evm_flash_init(void)
*/
if ((ret & 0x3F) == (ONENAND_MAP >> 24))
onenandcs = cs;
+ else if ((ret & 0x3F) == (NAND_MAP >> 24))
+ nandcs = cs;
cs++;
}
if (onenandcs > GPMC_CS_NUM) {
printk(KERN_INFO "OneNAND: Unable to find configuration "
" in GPMC\n ");
- return;
- }
-
- if (onenandcs < GPMC_CS_NUM) {
+ } else if (onenandcs < GPMC_CS_NUM) {
+ printk(KERN_INFO "OneNAND: on CS%d\n", onenandcs);
omap3evm_onenand_data.cs = onenandcs;
if (platform_device_register(&omap3evm_onenand_device) < 0)
printk(KERN_ERR "Unable to register OneNAND device\n");
}
-}
+ if (nandcs > GPMC_CS_NUM) {
+ printk(KERN_INFO "NAND: Unable to find configuration "
+ "in GPMC\n ");
+ } else if (nandcs < GPMC_CS_NUM) {
+ printk(KERN_INFO "NAND: on CS%d\n", nandcs);
+ omap3evm_nand_data.cs = nandcs;
+ omap3evm_nand_data.gpmc_cs_baseaddr = (void *)
+ (gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);
+ omap3evm_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);
+ printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
+ if (platform_device_register(&omap3evm_nand_device) < 0)
+ printk(KERN_ERR "Unable to register NAND device\n");
+ }
+}
diff --git a/arch/arm/plat-omap/include/mach/board-omap3evm.h b/arch/arm/plat-omap/include/mach/board-omap3evm.h
index 7a540e9..0c7c05c 100644
--- a/arch/arm/plat-omap/include/mach/board-omap3evm.h
+++ b/arch/arm/plat-omap/include/mach/board-omap3evm.h
@@ -40,5 +40,7 @@ extern void omap3evm_flash_init(void);
#define OMAP3EVM_ETHR_GPIO_IRQ 176
#define OMAP3EVM_SMC911X_CS 5
+#define NAND_MAP 0x30000000
+
#endif /* __ASM_ARCH_OMAP3_EVM_H */
--
1.5.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Adding support for NAND partitions in OMAP3 EVM.
2008-11-28 5:36 [PATCH 1/1] Adding support for NAND partitions in OMAP3 EVM Manikandan Pillai
@ 2009-01-08 14:56 ` Tony Lindgren
2009-01-08 15:37 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Tony Lindgren @ 2009-01-08 14:56 UTC (permalink / raw)
To: Manikandan Pillai; +Cc: linux-omap
* Manikandan Pillai <mani.pillai@ti.com> [081128 07:36]:
> Flash initialization has been modified to take care on NAND initialization
> and creation of NAND partitions.
Pushing to l-o tree. Do you also want to prepare patches against
the mainline tree for minimal omap3evm support for the next merge
window?
Regards,
Tony
> Signed-off-by: Manikandan Pillai <mani.pillai@ti.com>
> ---
> arch/arm/mach-omap2/board-omap3evm-flash.c | 85 ++++++++++++++++++++--
> arch/arm/plat-omap/include/mach/board-omap3evm.h | 2 +
> 2 files changed, 82 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-omap3evm-flash.c b/arch/arm/mach-omap2/board-omap3evm-flash.c
> index 5f3663d..72c7f5b 100644
> --- a/arch/arm/mach-omap2/board-omap3evm-flash.c
> +++ b/arch/arm/mach-omap2/board-omap3evm-flash.c
> @@ -23,6 +23,9 @@
> #include <mach/gpmc.h>
> #include <mach/nand.h>
>
> +#define GPMC_CS0_BASE 0x60
> +#define GPMC_CS_SIZE 0x30
> +
> static int omap3evm_onenand_setup(void __iomem *, int freq);
>
> static struct mtd_partition omap3evm_onenand_partitions[] = {
> @@ -70,6 +73,63 @@ static struct platform_device omap3evm_onenand_device = {
> },
> };
>
> +static struct mtd_partition omap3evm_nand_partitions[] = {
> + /* All the partition sizes are listed in terms of NAND block size */
> + {
> + .name = "X-Loader-NAND",
> + .offset = 0,
> + .size = 4*(128 * 1024),
> + .mask_flags = MTD_WRITEABLE, /* force read-only */
> + },
> + {
> + .name = "U-Boot-NAND",
> + .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */
> + .size = 14*(128 * 1024),
> + .mask_flags = MTD_WRITEABLE, /* force read-only */
> + },
> + {
> + .name = "Boot Env-NAND",
> +
> + .offset = MTDPART_OFS_APPEND, /* Offset = 0x100000 */
> + .size = 2*(128 * 1024),
> + },
> + {
> + .name = "Kernel-NAND",
> + .offset = MTDPART_OFS_APPEND, /* Offset = 0x140000 */
> + .size = 40*(128 * 1024),
> + },
> + {
> + .name = "File System - NAND",
> + .size = MTDPART_SIZ_FULL,
> + .offset = MTDPART_OFS_APPEND, /* Offset = 0x540000 */
> + },
> +};
> +
> +/* dip switches control NAND chip access: 8 bit, 16 bit, or neither */
> +static struct omap_nand_platform_data omap3evm_nand_data = {
> + .parts = omap3evm_nand_partitions,
> + .nr_parts = ARRAY_SIZE(omap3evm_nand_partitions),
> + .nand_setup = NULL,
> + .dma_channel = -1, /* disable DMA in OMAP NAND driver */
> + .dev_ready = NULL,
> + .options = NAND_SAMSUNG_LP_OPTIONS,
> +};
> +
> +static struct resource omap3evm_nand_resource = {
> + .flags = IORESOURCE_MEM,
> +};
> +
> +static struct platform_device omap3evm_nand_device = {
> + .name = "omap2-nand",
> + .id = 0,
> + .dev = {
> + .platform_data = &omap3evm_nand_data,
> + },
> + .num_resources = 1,
> + .resource = &omap3evm_nand_resource,
> +};
> +
> +
> /*
> * omap3evm_onenand_setup - Set the onenand sync mode
> * @onenand_base: The onenand base address in GPMC memory map
> @@ -86,6 +146,8 @@ void __init omap3evm_flash_init(void)
> {
> u8 cs = 0;
> u8 onenandcs = GPMC_CS_NUM + 1;
> + u8 nandcs = GPMC_CS_NUM + 1;
> + u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;
>
> while (cs < GPMC_CS_NUM) {
> u32 ret = 0;
> @@ -100,18 +162,31 @@ void __init omap3evm_flash_init(void)
> */
> if ((ret & 0x3F) == (ONENAND_MAP >> 24))
> onenandcs = cs;
> + else if ((ret & 0x3F) == (NAND_MAP >> 24))
> + nandcs = cs;
> cs++;
> }
> if (onenandcs > GPMC_CS_NUM) {
> printk(KERN_INFO "OneNAND: Unable to find configuration "
> " in GPMC\n ");
> - return;
> - }
> -
> - if (onenandcs < GPMC_CS_NUM) {
> + } else if (onenandcs < GPMC_CS_NUM) {
> + printk(KERN_INFO "OneNAND: on CS%d\n", onenandcs);
> omap3evm_onenand_data.cs = onenandcs;
> if (platform_device_register(&omap3evm_onenand_device) < 0)
> printk(KERN_ERR "Unable to register OneNAND device\n");
> }
> -}
>
> + if (nandcs > GPMC_CS_NUM) {
> + printk(KERN_INFO "NAND: Unable to find configuration "
> + "in GPMC\n ");
> + } else if (nandcs < GPMC_CS_NUM) {
> + printk(KERN_INFO "NAND: on CS%d\n", nandcs);
> + omap3evm_nand_data.cs = nandcs;
> + omap3evm_nand_data.gpmc_cs_baseaddr = (void *)
> + (gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);
> + omap3evm_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);
> + printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
> + if (platform_device_register(&omap3evm_nand_device) < 0)
> + printk(KERN_ERR "Unable to register NAND device\n");
> + }
> +}
> diff --git a/arch/arm/plat-omap/include/mach/board-omap3evm.h b/arch/arm/plat-omap/include/mach/board-omap3evm.h
> index 7a540e9..0c7c05c 100644
> --- a/arch/arm/plat-omap/include/mach/board-omap3evm.h
> +++ b/arch/arm/plat-omap/include/mach/board-omap3evm.h
> @@ -40,5 +40,7 @@ extern void omap3evm_flash_init(void);
> #define OMAP3EVM_ETHR_GPIO_IRQ 176
> #define OMAP3EVM_SMC911X_CS 5
>
> +#define NAND_MAP 0x30000000
> +
> #endif /* __ASM_ARCH_OMAP3_EVM_H */
>
> --
> 1.5.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Adding support for NAND partitions in OMAP3 EVM.
2009-01-08 14:56 ` Tony Lindgren
@ 2009-01-08 15:37 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2009-01-08 15:37 UTC (permalink / raw)
To: Manikandan Pillai; +Cc: linux-omap
* Tony Lindgren <tony@atomide.com> [090108 16:56]:
> * Manikandan Pillai <mani.pillai@ti.com> [081128 07:36]:
> > Flash initialization has been modified to take care on NAND initialization
> > and creation of NAND partitions.
>
> Pushing to l-o tree. Do you also want to prepare patches against
> the mainline tree for minimal omap3evm support for the next merge
> window?
Actually looks like there's a more complete patch by Josh Karabin,
so will use that instead.
> Regards,
>
> Tony
>
>
> > Signed-off-by: Manikandan Pillai <mani.pillai@ti.com>
> > ---
> > arch/arm/mach-omap2/board-omap3evm-flash.c | 85 ++++++++++++++++++++--
> > arch/arm/plat-omap/include/mach/board-omap3evm.h | 2 +
> > 2 files changed, 82 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-omap3evm-flash.c b/arch/arm/mach-omap2/board-omap3evm-flash.c
> > index 5f3663d..72c7f5b 100644
> > --- a/arch/arm/mach-omap2/board-omap3evm-flash.c
> > +++ b/arch/arm/mach-omap2/board-omap3evm-flash.c
> > @@ -23,6 +23,9 @@
> > #include <mach/gpmc.h>
> > #include <mach/nand.h>
> >
> > +#define GPMC_CS0_BASE 0x60
> > +#define GPMC_CS_SIZE 0x30
> > +
> > static int omap3evm_onenand_setup(void __iomem *, int freq);
> >
> > static struct mtd_partition omap3evm_onenand_partitions[] = {
> > @@ -70,6 +73,63 @@ static struct platform_device omap3evm_onenand_device = {
> > },
> > };
> >
> > +static struct mtd_partition omap3evm_nand_partitions[] = {
> > + /* All the partition sizes are listed in terms of NAND block size */
> > + {
> > + .name = "X-Loader-NAND",
> > + .offset = 0,
> > + .size = 4*(128 * 1024),
> > + .mask_flags = MTD_WRITEABLE, /* force read-only */
> > + },
> > + {
> > + .name = "U-Boot-NAND",
> > + .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */
> > + .size = 14*(128 * 1024),
> > + .mask_flags = MTD_WRITEABLE, /* force read-only */
> > + },
> > + {
> > + .name = "Boot Env-NAND",
> > +
> > + .offset = MTDPART_OFS_APPEND, /* Offset = 0x100000 */
> > + .size = 2*(128 * 1024),
> > + },
> > + {
> > + .name = "Kernel-NAND",
> > + .offset = MTDPART_OFS_APPEND, /* Offset = 0x140000 */
> > + .size = 40*(128 * 1024),
> > + },
> > + {
> > + .name = "File System - NAND",
> > + .size = MTDPART_SIZ_FULL,
> > + .offset = MTDPART_OFS_APPEND, /* Offset = 0x540000 */
> > + },
> > +};
> > +
> > +/* dip switches control NAND chip access: 8 bit, 16 bit, or neither */
> > +static struct omap_nand_platform_data omap3evm_nand_data = {
> > + .parts = omap3evm_nand_partitions,
> > + .nr_parts = ARRAY_SIZE(omap3evm_nand_partitions),
> > + .nand_setup = NULL,
> > + .dma_channel = -1, /* disable DMA in OMAP NAND driver */
> > + .dev_ready = NULL,
> > + .options = NAND_SAMSUNG_LP_OPTIONS,
> > +};
> > +
> > +static struct resource omap3evm_nand_resource = {
> > + .flags = IORESOURCE_MEM,
> > +};
> > +
> > +static struct platform_device omap3evm_nand_device = {
> > + .name = "omap2-nand",
> > + .id = 0,
> > + .dev = {
> > + .platform_data = &omap3evm_nand_data,
> > + },
> > + .num_resources = 1,
> > + .resource = &omap3evm_nand_resource,
> > +};
> > +
> > +
> > /*
> > * omap3evm_onenand_setup - Set the onenand sync mode
> > * @onenand_base: The onenand base address in GPMC memory map
> > @@ -86,6 +146,8 @@ void __init omap3evm_flash_init(void)
> > {
> > u8 cs = 0;
> > u8 onenandcs = GPMC_CS_NUM + 1;
> > + u8 nandcs = GPMC_CS_NUM + 1;
> > + u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;
> >
> > while (cs < GPMC_CS_NUM) {
> > u32 ret = 0;
> > @@ -100,18 +162,31 @@ void __init omap3evm_flash_init(void)
> > */
> > if ((ret & 0x3F) == (ONENAND_MAP >> 24))
> > onenandcs = cs;
> > + else if ((ret & 0x3F) == (NAND_MAP >> 24))
> > + nandcs = cs;
> > cs++;
> > }
> > if (onenandcs > GPMC_CS_NUM) {
> > printk(KERN_INFO "OneNAND: Unable to find configuration "
> > " in GPMC\n ");
> > - return;
> > - }
> > -
> > - if (onenandcs < GPMC_CS_NUM) {
> > + } else if (onenandcs < GPMC_CS_NUM) {
> > + printk(KERN_INFO "OneNAND: on CS%d\n", onenandcs);
> > omap3evm_onenand_data.cs = onenandcs;
> > if (platform_device_register(&omap3evm_onenand_device) < 0)
> > printk(KERN_ERR "Unable to register OneNAND device\n");
> > }
> > -}
> >
> > + if (nandcs > GPMC_CS_NUM) {
> > + printk(KERN_INFO "NAND: Unable to find configuration "
> > + "in GPMC\n ");
> > + } else if (nandcs < GPMC_CS_NUM) {
> > + printk(KERN_INFO "NAND: on CS%d\n", nandcs);
> > + omap3evm_nand_data.cs = nandcs;
> > + omap3evm_nand_data.gpmc_cs_baseaddr = (void *)
> > + (gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);
> > + omap3evm_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);
> > + printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
> > + if (platform_device_register(&omap3evm_nand_device) < 0)
> > + printk(KERN_ERR "Unable to register NAND device\n");
> > + }
> > +}
> > diff --git a/arch/arm/plat-omap/include/mach/board-omap3evm.h b/arch/arm/plat-omap/include/mach/board-omap3evm.h
> > index 7a540e9..0c7c05c 100644
> > --- a/arch/arm/plat-omap/include/mach/board-omap3evm.h
> > +++ b/arch/arm/plat-omap/include/mach/board-omap3evm.h
> > @@ -40,5 +40,7 @@ extern void omap3evm_flash_init(void);
> > #define OMAP3EVM_ETHR_GPIO_IRQ 176
> > #define OMAP3EVM_SMC911X_CS 5
> >
> > +#define NAND_MAP 0x30000000
> > +
> > #endif /* __ASM_ARCH_OMAP3_EVM_H */
> >
> > --
> > 1.5.6
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-01-08 15:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-28 5:36 [PATCH 1/1] Adding support for NAND partitions in OMAP3 EVM Manikandan Pillai
2009-01-08 14:56 ` Tony Lindgren
2009-01-08 15:37 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox