Introducing 'gpmc-nand.c' for GPMC specific NAND init
Subsystems (7)
Arm (32-bit) Arm sub-architectures Memory technology devices (MTD) OMAP2+ support +3 more subsystems
PATCH 1/3 Introducing 'gpmc-nand.c' for GPMC specific NAND init
Introducing 'gpmc-nand.c' for GPMC specific NAND init. For example: GPMC timing parameters and all.
This patch also migrates gpmc related calls from 'nand/omap2.c' to 'gpmc-nand.c'.
Signed-off-by Vimal Singh <[email protected]>
--- arch/arm/mach-omap2/Makefile | 3 + arch/arm/mach-omap2/gpmc-nand.c | 139 ++++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/nand.h | 10 ++- drivers/mtd/nand/omap2.c | 35 +------- 4 files changed, 155 insertions(+), 32 deletions(-) create mode 100644 arch/arm/mach-omap2/gpmc-nand.c
arch/arm/mach-omap2/Makefile +3 -0
@@ -135,5 +135,8 @@ obj-y += usb-ehci.o onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o obj-y += $(onenand-m) $(onenand-y) +nand-$(CONFIG_MTD_NAND_OMAP2) := gpmc-nand.o +obj-y += $(nand-m) $(nand-y) + smc91x-$(CONFIG_SMC91X) := gpmc-smc91x.o obj-y += $(smc91x-m) $(smc91x-y)
arch/arm/mach-omap2/gpmc-nand.c new file +139 -0
139 lines not on this page · raw message
(quoted diff) +0 -0
b/arch/arm/plat-omap/include/plat/nand.h
index 631a7be..6ba88d2 100644
arch/arm/plat-omap/include/plat/nand.h +9 -1
@@ -15,10 +15,18 @@ struct omap_nand_platform_data {int cs;int gpio_irq;struct mtd_partition *parts; +struct gpmc_timings *gpmc_t;int nr_parts; -int (*nand_setup)(void __iomem *); +int (*nand_setup)(void );int (*dev_ready)(struct omap_nand_platform_data *);int dma_channel; +unsigned long phys_base;void __iomem *gpmc_cs_baseaddr;void __iomem *gpmc_baseaddr; +int devsize; }; + +/* size (4 KiB) for IO mapping */ +#define NAND_IO_SIZE SZ_4K + +extern int gpmc_nand_init (struct omap_nand_platform_data *d);
drivers/mtd/nand/omap2.c +4 -31
@@ -30,12 +30,8 @@#define DRIVER_NAME "omap2-nand" -/* size (4 KiB) for IO mapping */ -#define NAND_IO_SIZE SZ_4K -#define NAND_WP_OFF 0#define NAND_WP_BIT 0x00000010 -#define WR_RD_PIN_MONITORING 0x00600000#define GPMC_BUF_FULL 0x00000001#define GPMC_BUF_EMPTY 0x00000000
@@ -885,8 +881,6 @@ static int __devinit omap_nand_probe(structstruct omap_nand_info *info;struct omap_nand_platform_data *pdata;int err; -unsigned long val; - pdata = pdev->dev.platform_data;if (pdata ==NULL ) {
@@ -908,28 +902,14 @@ static int __devinit omap_nand_probe(struct info->gpmc_cs = pdata->cs; info->gpmc_baseaddr = pdata->gpmc_baseaddr; info->gpmc_cs_baseaddr = pdata->gpmc_cs_baseaddr; + info->phys_base = pdata->phys_base; info->mtd.priv = &info->nand; info->mtd.name =dev_name (&pdev->dev); info->mtd.owner =THIS_MODULE ; - err =gpmc_cs_request (info->gpmc_cs,NAND_IO_SIZE , &info->phys_base); -if (err <0 ) { -dev_err (&pdev->dev,"Cannot request GPMC CS\n" ); - goto out_free_info; - } - -/* Enable RD PIN Monitoring Reg */ -if (pdata->dev_ready) { - val =gpmc_cs_read_reg (info->gpmc_cs,GPMC_CS_CONFIG1 ); - val |=WR_RD_PIN_MONITORING ; -gpmc_cs_write_reg (info->gpmc_cs,GPMC_CS_CONFIG1 , val); - } - - val =gpmc_cs_read_reg (info->gpmc_cs,GPMC_CS_CONFIG7 ); - val &= ~(0xf <<8 ); - val |= (0xc &0xf ) <<8 ; -gpmc_cs_write_reg (info->gpmc_cs,GPMC_CS_CONFIG7 , val); + info->nand.options |= pdata->devsize ?NAND_BUSWIDTH_16 :0 ; + info->nand.options |=NAND_SKIP_BBTSCAN ;/* NAND write protect off */ omap_nand_wp (&info->mtd,NAND_WP_OFF );
@@ -937,7 +917,7 @@ static int __devinit omap_nand_probe(structif (!request_mem_region (info->phys_base,NAND_IO_SIZE , pdev->dev.driver->name)) { err = -EBUSY ; - goto out_free_cs; + goto out_free_info; } info->nand.IO_ADDR_R =ioremap (info->phys_base,NAND_IO_SIZE );
@@ -966,11 +946,6 @@ static int __devinit omap_nand_probe(struct info->nand.chip_delay =50 ; } - info->nand.options |=NAND_SKIP_BBTSCAN ; -if ((gpmc_cs_read_reg (info->gpmc_cs,GPMC_CS_CONFIG1 ) &0x3000 ) - ==0x1000 ) - info->nand.options |=NAND_BUSWIDTH_16 ; -if (use_prefetch) {/* copy the virtual address of nand base for fifo access */ info->nand_pref_fifo_add = info->nand.IO_ADDR_R;
@@ -1046,8 +1021,6 @@ static int __devinit omap_nand_probe(struct out_release_mem_region:release_mem_region (info->phys_base,NAND_IO_SIZE ); -out_free_cs: -gpmc_cs_free (info->gpmc_cs); out_free_info:kfree (info);
Signature · 1 line
1.6.3.3