On Fri, Feb 12, 2010 at 2:49 AM, Tony Lindgren <tony@xxxxxxxxxxx> wrote: > * Tony Lindgren <tony@xxxxxxxxxxx> [100211 12:43]: >> * Vimal Singh <vimal.newwork@xxxxxxxxx> [100210 21:16]: >> > From: Vimal Singh <vimalsingh@xxxxxx> >> > >> > This patch adds 'board-zoom-flash.c', which could be utilized >> > by boards similar to ZOOM2. (For ex: LDP, ZOOM2, ZOOM3). >> > >> > This does initialization for NAND device based on the 'cs' number >> > and partition information passed from board file (ex: board-zoom2.c). >> > >> > Signed-off-by: Vimal Singh <vimalsingh@xxxxxx> >> > --- >> > arch/arm/mach-omap2/board-zoom-flash.c | 85 +++++++++++++++++++++++++ >> > arch/arm/mach-omap2/include/mach/board-zoom.h | 11 +++ >> > 2 files changed, 96 insertions(+), 0 deletions(-) >> > create mode 100644 arch/arm/mach-omap2/board-zoom-flash.c >> > >> > diff --git a/arch/arm/mach-omap2/board-zoom-flash.c >> > b/arch/arm/mach-omap2/board-zoom-flash.c >> > new file mode 100644 >> > index 0000000..f2328a4 >> > --- /dev/null >> > +++ b/arch/arm/mach-omap2/board-zoom-flash.c >> > @@ -0,0 +1,85 @@ >> > +/* >> > + * board-zoom-flash.c >> > + * >> > + * Copyright (C) 2009 Texas Instruments Inc. >> > + * Vimal Singh <vimalsingh@xxxxxx> >> > + * >> > + * This program is free software; you can redistribute it and/or modify >> > + * it under the terms of the GNU General Public License version 2 as >> > + * published by the Free Software Foundation. >> > + */ >> > + >> > +#include <linux/kernel.h> >> > +#include <linux/delay.h> >> > +#include <linux/platform_device.h> >> > +#include <linux/mtd/nand.h> >> > +#include <linux/types.h> >> > +#include <linux/io.h> >> > + >> > +#include <asm/mach/flash.h> >> > +#include <plat/board.h> >> > +#include <plat/gpmc.h> >> > +#include <plat/nand.h> >> > + >> > +#include <mach/board-zoom.h> >> > + >> > +#if defined(CONFIG_MTD_NAND_OMAP2) || \ >> > + defined(CONFIG_MTD_NAND_OMAP2_MODULE) >> > + >> > +/* Note that all values in this struct are in nanoseconds */ >> > +static struct gpmc_timings nand_timings = { >> > + >> > + .sync_clk = 0, >> > + >> > + .cs_on = 0, >> > + .cs_rd_off = 36, >> > + .cs_wr_off = 36, >> > + >> > + .adv_on = 6, >> > + .adv_rd_off = 24, >> > + .adv_wr_off = 36, >> > + >> > + .we_off = 30, >> > + .oe_off = 48, >> > + >> > + .access = 54, >> > + .rd_cycle = 72, >> > + .wr_cycle = 72, >> > + >> > + .wr_access = 30, >> > + .wr_data_mux_bus = 0, >> > +}; >> > + >> > +/* NAND chip access: 16 bit */ >> > +static struct omap_nand_platform_data zoom_nand_data = { >> > + .nand_setup = NULL, >> > + .gpmc_t = &nand_timings, >> > + .dma_channel = -1, /* disable DMA in OMAP NAND driver */ >> > + .dev_ready = NULL, >> > + .devsize = 1, /* '0' for 8-bit, '1' for 16-bit device */ >> > +}; >> > + >> > +/** >> > + * zoom_flash_init - Identify devices connected to GPMC and register. >> > + * >> > + * @return - void. >> > + */ >> > +void __init zoom_flash_init(struct flash_partitions zoom_nand_parts[], int cs) >> > +{ >> > + u32 gpmc_base_add = OMAP34XX_GPMC_VIRT; >> > + >> > + zoom_nand_data.cs = cs; >> > + zoom_nand_data.parts = zoom_nand_parts[0].parts; >> > + zoom_nand_data.nr_parts = zoom_nand_parts[0].nr_parts; >> > + zoom_nand_data.gpmc_baseaddr = (void *)(gpmc_base_add); >> > + zoom_nand_data.gpmc_cs_baseaddr = (void *)(gpmc_base_add + >> > + GPMC_CS0_BASE + >> > + cs * GPMC_CS_SIZE); >> >> The gpmc_baseaddr and gpmc_cs_baseaddr should no longer be >> needed with gpmc-nand.c, right? As said earlier too these are needed by 'nand/omap2.c' driver not for gpmc.-nand.c, we still need to pass these. > > Yeah.. For now, I suggest you set the gpmc_baseaddr and > gpmc_cs_baseaddr in gpmc_nand_init() based on the results from > gpmc_cs_request. > > That will allow us to remove the insane hardcoded gpmc virtual > addresses from all board-*.c files. OK > > And then we can finally fix gpmc-nand.c driver not to go tinker You mean omap2.c nand driver? > with the GPMC registers directly. All of that should be in > gpmc-nand.c using gpmc.c. The driver should be just a generic > NAND driver. Yes, but that will take complete clean-up of omap2.c nand driver by moving all functions accessing GPMC registers from 'nand/omap2.c' to 'gpmc-nand.c'. And we can take that work later. Once everything is working fine and is at proper place, clean-up will have more visibility. IMHO, you can still take patches for now. As, this is how already done for sdp boards too. -- Regards, Vimal Singh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html