]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
omap2/3/4: Introducing 'gpmc-nand.c' for GPMC specific NAND init
authorVimal Singh <vimalsingh@ti.com>
Mon, 15 Feb 2010 18:03:33 +0000 (10:03 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 15 Feb 2010 18:03:33 +0000 (10:03 -0800)
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 <vimalsingh@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/gpmc-nand.c [new file with mode: 0644]
arch/arm/plat-omap/include/plat/nand.h
drivers/mtd/nand/omap2.c

index 492cf164e000ec66374326f042af540af2b1d864..0b17dca695fd63dfb10bdc9b87f64e7c202b669e 100644 (file)
@@ -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)
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
new file mode 100644 (file)
index 0000000..64d74f0
--- /dev/null
@@ -0,0 +1,139 @@
+/*
+ * gpmc-nand.c
+ *
+ * Copyright (C) 2009 Texas Instruments
+ * Vimal Singh <vimalsingh@ti.com>
+ *
+ * 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/platform_device.h>
+#include <linux/io.h>
+
+#include <asm/mach/flash.h>
+
+#include <plat/nand.h>
+#include <plat/board.h>
+#include <plat/gpmc.h>
+
+#define WR_RD_PIN_MONITORING   0x00600000
+
+static struct omap_nand_platform_data *gpmc_nand_data;
+
+static struct resource gpmc_nand_resource = {
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device gpmc_nand_device = {
+       .name           = "omap2-nand",
+       .id             = 0,
+       .num_resources  = 1,
+       .resource       = &gpmc_nand_resource,
+};
+
+static int omap2_nand_gpmc_retime(void)
+{
+       struct gpmc_timings t;
+       int err;
+
+       memset(&t, 0, sizeof(t));
+       t.sync_clk = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->sync_clk);
+       t.cs_on = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->cs_on);
+       t.adv_on = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->adv_on);
+
+       /* Read */
+       t.adv_rd_off = gpmc_round_ns_to_ticks(
+                               gpmc_nand_data->gpmc_t->adv_rd_off);
+       t.oe_on  = t.adv_on;
+       t.access = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->access);
+       t.oe_off = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->oe_off);
+       t.cs_rd_off = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->cs_rd_off);
+       t.rd_cycle  = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->rd_cycle);
+
+       /* Write */
+       t.adv_wr_off = gpmc_round_ns_to_ticks(
+                               gpmc_nand_data->gpmc_t->adv_wr_off);
+       t.we_on  = t.oe_on;
+       if (cpu_is_omap34xx()) {
+           t.wr_data_mux_bus = gpmc_round_ns_to_ticks(
+                               gpmc_nand_data->gpmc_t->wr_data_mux_bus);
+           t.wr_access = gpmc_round_ns_to_ticks(
+                               gpmc_nand_data->gpmc_t->wr_access);
+       }
+       t.we_off = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->we_off);
+       t.cs_wr_off = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->cs_wr_off);
+       t.wr_cycle  = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->wr_cycle);
+
+       /* Configure GPMC */
+       gpmc_cs_write_reg(gpmc_nand_data->cs, GPMC_CS_CONFIG1,
+                       GPMC_CONFIG1_DEVICESIZE(gpmc_nand_data->devsize) |
+                       GPMC_CONFIG1_DEVICETYPE_NAND);
+
+       err = gpmc_cs_set_timings(gpmc_nand_data->cs, &t);
+       if (err)
+               return err;
+
+       return 0;
+}
+
+static int gpmc_nand_setup(void)
+{
+       struct device *dev = &gpmc_nand_device.dev;
+
+       /* Set timings in GPMC */
+       if (omap2_nand_gpmc_retime() < 0) {
+               dev_err(dev, "Unable to set gpmc timings\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+int __init gpmc_nand_init(struct omap_nand_platform_data *_nand_data)
+{
+       unsigned int val;
+       int err = 0;
+       struct device *dev = &gpmc_nand_device.dev;
+
+       gpmc_nand_data = _nand_data;
+       gpmc_nand_data->nand_setup = gpmc_nand_setup;
+       gpmc_nand_device.dev.platform_data = gpmc_nand_data;
+
+       err = gpmc_cs_request(gpmc_nand_data->cs, NAND_IO_SIZE,
+                               &gpmc_nand_data->phys_base);
+       if (err < 0) {
+               dev_err(dev, "Cannot request GPMC CS\n");
+               return err;
+       }
+
+       err = gpmc_nand_setup();
+       if (err < 0) {
+               dev_err(dev, "NAND platform setup failed: %d\n", err);
+               return err;
+       }
+
+       /* Enable RD PIN Monitoring Reg */
+       if (gpmc_nand_data->dev_ready) {
+               val  = gpmc_cs_read_reg(gpmc_nand_data->cs,
+                                                GPMC_CS_CONFIG1);
+               val |= WR_RD_PIN_MONITORING;
+               gpmc_cs_write_reg(gpmc_nand_data->cs,
+                                               GPMC_CS_CONFIG1, val);
+       }
+
+       err = platform_device_register(&gpmc_nand_device);
+       if (err < 0) {
+               dev_err(dev, "Unable to register NAND device\n");
+               goto out_free_cs;
+       }
+
+       return 0;
+
+out_free_cs:
+       gpmc_cs_free(gpmc_nand_data->cs);
+
+       return err;
+}
index 631a7bed1eefb8ac6fef57b02c5f60a850fb1c64..6ba88d2630d900c082938cec434c826c47720760 100644 (file)
@@ -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);
index 1bb799f0125c0e417542d34d7637a7ed8f25c3a6..26aec00801848590333a62252599c5406a345904 100644 (file)
 
 #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
@@ -882,8 +878,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
        struct omap_nand_info           *info;
        struct omap_nand_platform_data  *pdata;
        int                             err;
-       unsigned long                   val;
-
 
        pdata = pdev->dev.platform_data;
        if (pdata == NULL) {
@@ -905,28 +899,14 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
        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);
@@ -934,7 +914,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
        if (!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);
@@ -963,11 +943,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
                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;
@@ -1043,8 +1018,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
 
 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);