mtd: denali: add a DT driver

Add a device tree version of the Denali NAND driver. Based
on an original patch from Jamie Iles to add a MMIO version
of this driver.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

5 files changed, 200 insertions, 1 deletions

diff --git a/Documentation/devicetree/bindings/mtd/denali-nand.txt b/Documentation/devicetree/bindings/mtd/denali-nand.txt
new file mode 100644
index 000000000000..b04d03a1d499
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/denali-nand.txt
@@ -0,0 +1,23 @@
+* Denali NAND controller
+
+Required properties:
+  - compatible : should be "denali,denali-nand-dt"
+  - reg : should contain registers location and length for data and reg.
+  - reg-names: Should contain the reg names "nand_data" and "denali_reg"
+  - interrupts : The interrupt number.
+  - dm-mask : DMA bit mask
+
+The device tree may optionally contain sub-nodes describing partitions of the
+address space. See partition.txt for more detail.
+
+Examples:
+
+nand: nand@ff900000 {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "denali,denali-nand-dt";
+        reg = <0xff900000 0x100000>, <0xffb80000 0x10000>;
+        reg-names = "nand_data", "denali_reg";
+        interrupts = <0 144 4>;
+        dma-mask = <0xffffffff>;
+};
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 5102e87f8df0..ee803d611e4e 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -69,7 +69,14 @@ config MTD_NAND_DENALI_PCI
         help
           Enable the driver for NAND flash on Intel Moorestown, using the
           Denali NAND controller core.
- 
+
+config MTD_NAND_DENALI_DT
+        tristate "Support Denali NAND controller as a DT device"
+        depends on HAVE_CLK && MTD_NAND_DENALI
+        help
+          Enable the driver for NAND flash on platforms using a Denali NAND
+          controller as a DT device.
+
 config MTD_NAND_DENALI_SCRATCH_REG_ADDR
         hex "Denali NAND size scratch register address"
         default "0xFF108018"
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 96a6171c9d8f..38358c90771e 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_MTD_NAND_AMS_DELTA)	+= ams-delta.o
 obj-$(CONFIG_MTD_NAND_AUTCPU12)         += autcpu12.o
 obj-$(CONFIG_MTD_NAND_DENALI)           += denali.o
 obj-$(CONFIG_MTD_NAND_DENALI_PCI)       += denali_pci.o
+obj-$(CONFIG_MTD_NAND_DENALI_DT)        += denali_dt.o
 obj-$(CONFIG_MTD_NAND_AU1550)           += au1550nd.o
 obj-$(CONFIG_MTD_NAND_BF5XX)            += bf5xx_nand.o
 obj-$(CONFIG_MTD_NAND_PPCHAMELEONEVB)   += ppchameleonevb.o
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index e5aa99583e43..cec5712862c9 100644
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -466,6 +466,7 @@ struct nand_buf {
 
 #define INTEL_CE4100    1
 #define INTEL_MRST      2
+#define DT              3
 
 struct denali_nand_info {
         struct mtd_info mtd;
diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c
new file mode 100644
index 000000000000..fbabbaa04374
--- /dev/null
+++ b/drivers/mtd/nand/denali_dt.c
@@ -0,0 +1,167 @@
+/*
+ * NAND Flash Controller Device Driver for DT
+ *
+ * Copyright © 2011, Picochip.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/slab.h>
+
+#include "denali.h"
+
+struct denali_dt {
+        struct denali_nand_info denali;
+        struct clk              *clk;
+};
+
+static void __iomem *request_and_map(struct device *dev,
+                                     const struct resource *res)
+{
+        void __iomem *ptr;
+
+        if (!devm_request_mem_region(dev, res->start, resource_size(res),
+                                     "denali-dt")) {
+                dev_err(dev, "unable to request %s\n", res->name);
+                return NULL;
+        }
+
+        ptr = devm_ioremap_nocache(dev, res->start, resource_size(res));
+        if (!res)
+                dev_err(dev, "ioremap_nocache of %s failed!", res->name);
+
+        return ptr;
+}
+
+static const struct of_device_id denali_nand_dt_ids[] = {
+                { .compatible = "denali,denali-nand-dt" },
+                { /* sentinel */ }
+        };
+
+MODULE_DEVICE_TABLE(of, denali_nand_dt_ids);
+
+static u64 denali_dma_mask;
+
+static int __devinit denali_dt_probe(struct platform_device *ofdev)
+{
+        struct resource *denali_reg, *nand_data;
+        struct denali_dt *dt;
+        struct denali_nand_info *denali;
+        int ret;
+        const struct of_device_id *of_id;
+
+        of_id = of_match_device(denali_nand_dt_ids, &ofdev->dev);
+        if (of_id) {
+                ofdev->id_entry = of_id->data;
+        } else {
+                pr_err("Failed to find the right device id.\n");
+                return -ENOMEM;
+        }
+
+        dt = devm_kzalloc(&ofdev->dev, sizeof(*dt), GFP_KERNEL);
+        if (!dt)
+                return -ENOMEM;
+        denali = &dt->denali;
+
+        denali_reg = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "denali_reg");
+        nand_data = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "nand_data");
+        if (!denali_reg || !nand_data) {
+                dev_err(&ofdev->dev, "resources not completely defined\n");
+                return -EINVAL;
+        }
+
+        denali->platform = DT;
+        denali->dev = &ofdev->dev;
+        denali->irq = platform_get_irq(ofdev, 0);
+        if (denali->irq < 0) {
+                dev_err(&ofdev->dev, "no irq defined\n");
+                return -ENXIO;
+        }
+
+        denali->flash_reg = request_and_map(&ofdev->dev, denali_reg);
+        if (!denali->flash_reg)
+                return -ENOMEM;
+
+        denali->flash_mem = request_and_map(&ofdev->dev, nand_data);
+        if (!denali->flash_mem)
+                return -ENOMEM;
+
+        if (!of_property_read_u32(ofdev->dev.of_node,
+                "dma-mask", (u32 *)&denali_dma_mask)) {
+                denali->dev->dma_mask = &denali_dma_mask;
+        } else {
+                denali->dev->dma_mask = NULL;
+        }
+
+        dt->clk = clk_get(&ofdev->dev, NULL);
+        if (IS_ERR(dt->clk)) {
+                dev_err(&ofdev->dev, "no clk available\n");
+                return PTR_ERR(dt->clk);
+        }
+        clk_prepare_enable(dt->clk);
+
+        ret = denali_init(denali);
+        if (ret)
+                goto out_disable_clk;
+
+        platform_set_drvdata(ofdev, dt);
+        return 0;
+
+out_disable_clk:
+        clk_disable_unprepare(dt->clk);
+        clk_put(dt->clk);
+
+        return ret;
+}
+
+static int __devexit denali_dt_remove(struct platform_device *ofdev)
+{
+        struct denali_dt *dt = platform_get_drvdata(ofdev);
+
+        denali_remove(&dt->denali);
+        clk_disable(dt->clk);
+        clk_put(dt->clk);
+
+        return 0;
+}
+
+static struct platform_driver denali_dt_driver = {
+        .probe          = denali_dt_probe,
+        .remove         = __devexit_p(denali_dt_remove),
+        .driver         = {
+                .name   = "denali-nand-dt",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(denali_nand_dt_ids),
+        },
+};
+
+static int __init denali_init_dt(void)
+{
+        return platform_driver_register(&denali_dt_driver);
+}
+module_init(denali_init_dt);
+
+static void __exit denali_exit_dt(void)
+{
+        platform_driver_unregister(&denali_dt_driver);
+}
+module_exit(denali_exit_dt);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jamie Iles");
+MODULE_DESCRIPTION("DT driver for Denali NAND controller");