ATMEL: fix nand ecc support

- nand-ecc-mode : String, operation mode of the NAND ecc mode. Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first", "soft_bch".
- nand-bus-width : 8 or 16 bus width if not present 8
- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

---
 Documentation/devicetree/bindings/mtd/nand.txt |    7 ++
 drivers/of/Kconfig                             |    4 +
 drivers/of/Makefile                            |    1 +
 drivers/of/of_mtd.c                            |   90 ++++++++++++++++++++++++
 include/linux/of_mtd.h                         |   19 +++++
 5 files changed, 121 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/nand.txt
 create mode 100644 drivers/of/of_mtd.c
 create mode 100644 include/linux/of_mtd.h

Documentation/devicetree/bindings/mtd/nand.txt new file +7 -0

new file mode 100644
index 0000000..03855c8
@@ -0,0 +1,7 @@
+* MTD generic binding
+
+- nand-ecc-mode : String, operation mode of the NAND ecc mode.
+  Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first",
+  "soft_bch".
+- nand-bus-width : 8 or 16 bus width if not present 8
+- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false

drivers/of/Kconfig +4 -0

index 268163d..fa666a9 100644
@@ -90,4 +90,8 @@ config OF_PCI_IRQ
 	help
 	  OpenFirmware PCI IRQ routing helpers
 
+config OF_MTD
+	depends on MTD
+	def_bool y
+
 endmenu # OF

drivers/of/Makefile +1 -0

index a73f5a5..8c4980a 100644
@@ -12,3 +12,4 @@ obj-$(CONFIG_OF_SELFTEST) += selftest.o
 obj-$(CONFIG_OF_MDIO)	+= of_mdio.o
 obj-$(CONFIG_OF_PCI)	+= of_pci.o
 obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
+obj-$(CONFIG_OF_NET)	+= of_mtd.o

drivers/of/of_mtd.c new file +90 -0

new file mode 100644
index 0000000..199bf58
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
+ *
+ * OF helpers for mtd.
+ *
+ * This file is released under the GPLv2
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/of_mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/export.h>
+
+/**
+ * It maps 'enum nand_ecc_modes_t' found in include/linux/mtd/nand.h
+ * into the device tree binding of 'phy-mode', so that Ethernet
+ * device driver can get phy interface from device tree.
+ */
+static const char *nand_ecc_modes[] = {
+	[NAND_ECC_NONE]		= "none",
+	[NAND_ECC_SOFT]		= "soft",
+	[NAND_ECC_HW]		= "hw",
+	[NAND_ECC_HW_SYNDROME]	= "hw_syndrome",
+	[NAND_ECC_HW_OOB_FIRST]	= "hw_oob_first",
+	[NAND_ECC_SOFT_BCH]	= "soft_bch",
+};
+
+/**
+ * of_get_nand_ecc_mode - Get nand ecc mode for given device_node
+ * @np:	Pointer to the given device_node
+ *
+ * The function gets ecc mode string from property 'nand-ecc-mode',
+ * and return its index in nand_ecc_modes table, or errno in error case.
+ */
+const int of_get_nand_ecc_mode(struct device_node *np)
+{
+	const char *pm;
+	int err, i;
+
+	err = of_property_read_string(np, "nand-ecc-mode", &pm);
+	if (err < 0)
+		return err;
+
+	for (i = 0; i < ARRAY_SIZE(nand_ecc_modes); i++)
+		if (!strcasecmp(pm, nand_ecc_modes[i]))
+			return i;
+
+	return -ENODEV;
+}
+EXPORT_SYMBOL_GPL(of_get_nand_ecc_mode);
+
+/**
+ * of_get_nand_bus_width - Get nand bus witdh for given device_node
+ * @np:	Pointer to the given device_node
+ *
+ * return bus width option, or errno in error case.
+ */
+int of_get_nand_bus_width(struct device_node *np)
+{
+	u32 val;
+
+	if (of_property_read_u32(np, "nand-bus-width", &val))
+		return 8;
+
+	switch(val) {
+	case 8:
+	case 16:
+		return val;
+	default:
+		return -EIO;
+	}
+}
+EXPORT_SYMBOL_GPL(of_get_nand_bus_width);
+
+/**
+ * of_get_nand_on_flash_bbt - Get nand on flash bbt for given device_node
+ * @np:	Pointer to the given device_node
+ *
+ * return true if 1 false other wise
+ */
+bool of_get_nand_on_flash_bbt(struct device_node *np)
+{
+	u32 val;
+
+	if (of_property_read_u32(np, "nand-on-flash-bbt", &val))
+		return false;
+
+	return val ? true : false;
+}
+EXPORT_SYMBOL_GPL(of_get_nand_on_flash_bbt);

include/linux/of_mtd.h new file +19 -0

new file mode 100644
index 0000000..bae1b60
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
+ *
+ * OF helpers for mtd.
+ *
+ * This file is released under the GPLv2
+ */
+
+#ifndef __LINUX_OF_MTD_H
+#define __LINUX_OF_NET_H
+
+#ifdef CONFIG_OF_MTD
+#include <linux/of.h>
+extern const int of_get_nand_ecc_mode(struct device_node *np);
+int of_get_nand_bus_width(struct device_node *np);
+bool of_get_nand_on_flash_bbt(struct device_node *np);
+#endif
+
+#endif /* __LINUX_OF_MTD_H */

Signature · 7 lines

1.7.7


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

use a local copy of board informatin and fill with DT data

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

---
 .../devicetree/bindings/mtd/atmel-nand.txt         |   41 ++++++++
 drivers/mtd/nand/atmel_nand.c                      |  107 ++++++++++++++++----
 2 files changed, 130 insertions(+), 18 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/atmel-nand.txt

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +41 -0

new file mode 100644
index 0000000..a910ab9
@@ -0,0 +1,41 @@
+Atmel NAND flash
+
+Required properties:
+- compatible : "atmel,at91rm9200-nand".
+- reg : should specify localbus address and size used for the chip,
+	and if availlable the ECC.
+- atmel,nand-addr-offset : offset for the address latch.
+- atmel,nand-cmd-offset : offset for the command latch.
+- #address-cells, #size-cells : Must be present if the device has sub-nodes
+  representing partitions.
+
+- gpios : specifies the gpio pins to control the NAND device. detect is an
+  optional gpio and may be set to 0 if not present.
+
+Optional properties:
+- nand-ecc-mode : String, operation mode of the NAND ecc mode, soft by default.
+  Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first",
+  "soft_bch".
+- nand-bus-width : 8 or 16 bus width if not present 8
+- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false
+
+Examples:
+nand0: nand at 40000000,0 {
+	compatible = "atmel,at91rm9200-nand";
+	#address-cells = <1>;
+	#size-cells = <1>;
+	reg = <0x40000000 0x10000000
+	       0xffffe800 0x200
+	      >;
+	atmel,nand-addr-offset = <21>;
+	atmel,nand-cmd-offset = <22>;
+	nand-on-flash-bbt = <1>;
+	nand-ecc-mode = "soft";
+	gpios = <&pioC 13 0
+		 &pioC 14 0
+		 0
+		>;
+	partition at 0 {
+		...
+	};
+};

drivers/mtd/nand/atmel_nand.c +33 -9

index d3bde9b..ea7643a 100644
@@ -27,6 +27,10 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/of_mtd.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>

@@ -83,7 +87,7 @@ struct atmel_nand_host {
 	struct mtd_info		mtd;
 	void __iomem		*io_base;
 	dma_addr_t		io_phys;
-	struct atmel_nand_data	*board;
+	struct atmel_nand_data	board;
 	struct device		*dev;
 	void __iomem		*ecc;
 

@@ -101,8 +105,8 @@ static int cpu_has_dma(void)
  */
 static void atmel_nand_enable(struct atmel_nand_host *host)
 {
-	if (gpio_is_valid(host->board->enable_pin))
-		gpio_set_value(host->board->enable_pin, 0);
+	if (gpio_is_valid(host->board.enable_pin))
+		gpio_set_value(host->board.enable_pin, 0);
 }
 
 /*

@@ -110,8 +114,8 @@ static void atmel_nand_enable(struct atmel_nand_host *host)
  */
 static void atmel_nand_disable(struct atmel_nand_host *host)
 {
-	if (gpio_is_valid(host->board->enable_pin))
-		gpio_set_value(host->board->enable_pin, 1);
+	if (gpio_is_valid(host->board.enable_pin))
+		gpio_set_value(host->board.enable_pin, 1);
 }
 
 /*

@@ -132,9 +136,9 @@ static void atmel_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl
 		return;
 
 	if (ctrl & NAND_CLE)
-		writeb(cmd, host->io_base + (1 << host->board->cle));
+		writeb(cmd, host->io_base + (1 << host->board.cle));
 	else
-		writeb(cmd, host->io_base + (1 << host->board->ale));
+		writeb(cmd, host->io_base + (1 << host->board.ale));
 }
 
 /*

@@ -145,8 +149,8 @@ static int atmel_nand_device_ready(struct mtd_info *mtd)
 	struct nand_chip *nand_chip = mtd->priv;
 	struct atmel_nand_host *host = nand_chip->priv;
 
-	return gpio_get_value(host->board->rdy_pin) ^
-                !!host->board->rdy_pin_active_low;
+	return gpio_get_value(host->board.rdy_pin) ^
+                !!host->board.rdy_pin_active_low;
 }
 
 static void dma_complete_func(void *completion)

@@ -432,6 +436,54 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)
 	}
 }
 
+static int __devinit atmel_of_init_port(struct atmel_nand_host *host,
+					 struct device_node *np)
+{
+	u32 val;
+	int ecc_mode;
+	struct atmel_nand_data *board = &host->board;
+	enum of_gpio_flags flags;
+
+	if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) {
+		if (val >= 32) {
+			dev_err(host->dev, "invalid addr-offset %u\n", val);
+			return -EINVAL;
+		}
+		board->ale = val;
+	}
+
+	if (of_property_read_u32(np, "atmel,nand-cmd-offset", &val) == 0) {
+		if (val >= 32) {
+			dev_err(host->dev, "invalid cmd-offset %u\n", val);
+			return -EINVAL;

drivers/mtd/nand/atmel_nand.c +35 -9

+
+	board->enable_pin = of_get_gpio(np, 1);
+	board->det_pin = of_get_gpio(np, 2);
+
+	return 0;
+}
+
 /*
  * Probe for the NAND device.
  */

@@ -442,6 +494,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	struct nand_chip *nand_chip;
 	struct resource *regs;
 	struct resource *mem;
+	struct mtd_part_parser_data ppdata = {};
 	int res;
 
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

@@ -468,8 +521,15 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
 	mtd = &host->mtd;
 	nand_chip = &host->nand_chip;
-	host->board = pdev->dev.platform_data;
 	host->dev = &pdev->dev;
+	if (pdev->dev.of_node) {
+		res = atmel_of_init_port(host, pdev->dev.of_node);
+		if (res)
+			goto err_nand_ioremap;
+	} else {
+		memcpy(&host->board, pdev->dev.platform_data,
+		       sizeof(struct atmel_nand_data));
+	}
 
 	nand_chip->priv = host;		/* link the private data structures */
 	mtd->priv = nand_chip;

@@ -480,10 +540,10 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	nand_chip->IO_ADDR_W = host->io_base;
 	nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl;
 
-	if (gpio_is_valid(host->board->rdy_pin))
+	if (gpio_is_valid(host->board.rdy_pin))
 		nand_chip->dev_ready = atmel_nand_device_ready;
 
-	nand_chip->ecc.mode = host->board->ecc_mode;
+	nand_chip->ecc.mode = host->board.ecc_mode;
 
 	regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	if (!regs && nand_chip->ecc.mode == NAND_ECC_HW) {

@@ -508,7 +568,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
 	nand_chip->chip_delay = 20;		/* 20us command delay time */
 
-	if (host->board->bus_width_16)	/* 16-bit bus width */
+	if (host->board.bus_width_16)	/* 16-bit bus width */
 		nand_chip->options |= NAND_BUSWIDTH_16;
 
 	nand_chip->read_buf = atmel_read_buf;

@@ -517,15 +577,15 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, host);
 	atmel_nand_enable(host);
 
-	if (gpio_is_valid(host->board->det_pin)) {
-		if (gpio_get_value(host->board->det_pin)) {
+	if (gpio_is_valid(host->board.det_pin)) {
+		if (gpio_get_value(host->board.det_pin)) {
 			printk(KERN_INFO "No SmartMedia card inserted.\n");
 			res = -ENXIO;
 			goto err_no_card;
 		}
 	}
 
-	if (host->board->on_flash_bbt || on_flash_bbt) {
+	if (host->board.on_flash_bbt || on_flash_bbt) {
 		printk(KERN_INFO "atmel_nand: Use On Flash BBT\n");
 		nand_chip->bbt_options |= NAND_BBT_USE_FLASH;
 	}

@@ -600,8 +660,9 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	}
 
 	mtd->name = "atmel_nand";
-	res = mtd_device_parse_register(mtd, NULL, 0,
-			host->board->parts, host->board->num_parts);
+	ppdata.of_node = pdev->dev.of_node;
+	res = mtd_device_parse_register(mtd, NULL, &ppdata,
+			host->board.parts, host->board.num_parts);
 	if (!res)
 		return res;
 

@@ -645,11 +706,21 @@ static int __exit atmel_nand_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id atmel_nand_dt_ids[] = {
+	{ .compatible = "atmel,at91rm9200-nand" },
+	{ /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, atmel_nand_dt_ids);
+#endif
+
 static struct platform_driver atmel_nand_driver = {
 	.remove		= __exit_p(atmel_nand_remove),
 	.driver		= {
 		.name	= "atmel_nand",
 		.owner	= THIS_MODULE,
+		.of_match_table	= of_match_ptr(atmel_nand_dt_ids),
 	},
 };
 

Signature · 7 lines

1.7.7


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

use a local copy of board informatin and fill with DT data

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

---
?.../devicetree/bindings/mtd/atmel-nand.txt ? ? ? ? | ? 41 ++++++++ ?drivers/mtd/nand/atmel_nand.c ? ? ? ? ? ? ? ? ? ? ?| ?107 ++++++++++++++++---- ?2 files changed, 130 insertions(+), 18 deletions(-)
?create mode 100644 Documentation/devicetree/bindings/mtd/atmel-nand.txt

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +3 -0

new file mode 100644
index 0000000..a910ab9
@@ -0,0 +1,41 @@
+Atmel NAND flash
+
+Required properties:

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +13 -0

+
+Optional properties:
+- nand-ecc-mode : String, operation mode of the NAND ecc mode, soft by default.
+ ?Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first",
+ ?"soft_bch".
+- nand-bus-width : 8 or 16 bus width if not present 8
+- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false
+
+Examples:
+nand0: nand at 40000000,0 {
+ ? ? ? compatible = "atmel,at91rm9200-nand";
+ ? ? ? #address-cells = <1>;
+ ? ? ? #size-cells = <1>;

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +5 -0

+ ? ? ? ? ? ? ? >;
+ ? ? ? partition at 0 {
+ ? ? ? ? ? ? ? ...
+ ? ? ? };
+};

drivers/mtd/nand/atmel_nand.c +0 -0

index d3bde9b..ea7643a 100644
@@ -27,6 +27,10 @@

?#include <linux/module.h>
?#include <linux/moduleparam.h>
?#include <linux/platform_device.h>

drivers/mtd/nand/atmel_nand.c +4 -0

+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/of_mtd.h>

?#include <linux/mtd/mtd.h>
?#include <linux/mtd/nand.h>
?#include <linux/mtd/partitions.h>

drivers/mtd/nand/atmel_nand.c +1 -1

@@ -83,7 +87,7 @@ struct atmel_nand_host {
 ? ? ? ?struct mtd_info ? ? ? ? mtd;
 ? ? ? ?void __iomem ? ? ? ? ? ?*io_base;
 ? ? ? ?dma_addr_t ? ? ? ? ? ? ?io_phys;
- ? ? ? struct atmel_nand_data ?*board;
+ ? ? ? struct atmel_nand_data ?board;
 ? ? ? ?struct device ? ? ? ? ? *dev;
 ? ? ? ?void __iomem ? ? ? ? ? ?*ecc;
 

@@ -101,8 +105,8 @@ static int cpu_has_dma(void)

?*/
?static void atmel_nand_enable(struct atmel_nand_host *host) ?{
- ? ? ? if (gpio_is_valid(host->board->enable_pin))
- ? ? ? ? ? ? ? gpio_set_value(host->board->enable_pin, 0);
+ ? ? ? if (gpio_is_valid(host->board.enable_pin))
+ ? ? ? ? ? ? ? gpio_set_value(host->board.enable_pin, 0); ?}

?/*

drivers/mtd/nand/atmel_nand.c +0 -0

@@ -110,8 +114,8 @@ static void atmel_nand_enable(struct atmel_nand_host *host)

?*/
?static void atmel_nand_disable(struct atmel_nand_host *host) ?{
- ? ? ? if (gpio_is_valid(host->board->enable_pin))
- ? ? ? ? ? ? ? gpio_set_value(host->board->enable_pin, 1);
+ ? ? ? if (gpio_is_valid(host->board.enable_pin))
+ ? ? ? ? ? ? ? gpio_set_value(host->board.enable_pin, 1); ?}

?/*

drivers/mtd/nand/atmel_nand.c +1 -1

@@ -132,9 +136,9 @@ static void atmel_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl
 ? ? ? ? ? ? ? ?return;
 
 ? ? ? ?if (ctrl & NAND_CLE)
- ? ? ? ? ? ? ? writeb(cmd, host->io_base + (1 << host->board->cle));
+ ? ? ? ? ? ? ? writeb(cmd, host->io_base + (1 << host->board.cle));

? ? ? ?else
- ? ? ? ? ? ? ? writeb(cmd, host->io_base + (1 << host->board->ale));
+ ? ? ? ? ? ? ? writeb(cmd, host->io_base + (1 << host->board.ale)); ?}

?/*

drivers/mtd/nand/atmel_nand.c +50 -2

@@ -145,8 +149,8 @@ static int atmel_nand_device_ready(struct mtd_info *mtd)
 ? ? ? ?struct nand_chip *nand_chip = mtd->priv;
 ? ? ? ?struct atmel_nand_host *host = nand_chip->priv;
 
- ? ? ? return gpio_get_value(host->board->rdy_pin) ^
- ? ? ? ? ? ? ? ?!!host->board->rdy_pin_active_low;
+ ? ? ? return gpio_get_value(host->board.rdy_pin) ^
+ ? ? ? ? ? ? ? ?!!host->board.rdy_pin_active_low;
 ?}
 
 ?static void dma_complete_func(void *completion)

@@ -432,6 +436,54 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)
 ? ? ? ?}
 ?}
 
+static int __devinit atmel_of_init_port(struct atmel_nand_host *host,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct device_node *np)
+{
+ ? ? ? u32 val;
+ ? ? ? int ecc_mode;
+ ? ? ? struct atmel_nand_data *board = &host->board;
+ ? ? ? enum of_gpio_flags flags;
+
+ ? ? ? if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) {
+ ? ? ? ? ? ? ? if (val >= 32) {
+ ? ? ? ? ? ? ? ? ? ? ? dev_err(host->dev, "invalid addr-offset %u\n", val);
+ ? ? ? ? ? ? ? ? ? ? ? return -EINVAL;
+ ? ? ? ? ? ? ? }
+ ? ? ? ? ? ? ? board->ale = val;
+ ? ? ? }
+
+ ? ? ? if (of_property_read_u32(np, "atmel,nand-cmd-offset", &val) == 0) {
+ ? ? ? ? ? ? ? if (val >= 32) {
+ ? ? ? ? ? ? ? ? ? ? ? dev_err(host->dev, "invalid cmd-offset %u\n", val);
+ ? ? ? ? ? ? ? ? ? ? ? return -EINVAL;
+ ? ? ? ? ? ? ? }
+ ? ? ? ? ? ? ? board->cle = val;
+ ? ? ? }
+
+ ? ? ? ecc_mode = of_get_nand_ecc_mode(np);
+
+ ? ? ? if (ecc_mode < 0)
+ ? ? ? ? ? ? ? board->ecc_mode = NAND_ECC_SOFT;
+ ? ? ? else
+ ? ? ? ? ? ? ? board->ecc_mode = ecc_mode;
+
+ ? ? ? board->on_flash_bbt = of_get_nand_on_flash_bbt(np);
+
+ ? ? ? if (of_get_nand_bus_width(np) == 16)
+ ? ? ? ? ? ? ? board->bus_width_16 = 1;
+
+ ? ? ? board->rdy_pin = of_get_gpio_flags(np, 0, &flags);
+ ? ? ? if (flags == OF_GPIO_ACTIVE_LOW)
+ ? ? ? ? ? ? ? board->rdy_pin_active_low = 1;
+ ? ? ? else
+ ? ? ? ? ? ? ? board->rdy_pin_active_low = 0;
+
+ ? ? ? board->enable_pin = of_get_gpio(np, 1);
+ ? ? ? board->det_pin = of_get_gpio(np, 2);
+
+ ? ? ? return 0;
+}
+

?/*
?* Probe for the NAND device.
?*/

drivers/mtd/nand/atmel_nand.c +9 -1

@@ -442,6 +494,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 ? ? ? ?struct nand_chip *nand_chip;
 ? ? ? ?struct resource *regs;
 ? ? ? ?struct resource *mem;
+ ? ? ? struct mtd_part_parser_data ppdata = {};
 ? ? ? ?int res;
 
 ? ? ? ?mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

@@ -468,8 +521,15 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
 ? ? ? ?mtd = &host->mtd;
 ? ? ? ?nand_chip = &host->nand_chip;
- ? ? ? host->board = pdev->dev.platform_data;
 ? ? ? ?host->dev = &pdev->dev;
+ ? ? ? if (pdev->dev.of_node) {
+ ? ? ? ? ? ? ? res = atmel_of_init_port(host, pdev->dev.of_node);
+ ? ? ? ? ? ? ? if (res)
+ ? ? ? ? ? ? ? ? ? ? ? goto err_nand_ioremap;
+ ? ? ? } else {
+ ? ? ? ? ? ? ? memcpy(&host->board, pdev->dev.platform_data,
+ ? ? ? ? ? ? ? ? ? ? ?sizeof(struct atmel_nand_data));
+ ? ? ? }
 

? ? ? ?nand_chip->priv = host; ? ? ? ? /* link the private data structures */ ? ? ? ?mtd->priv = nand_chip;

drivers/mtd/nand/atmel_nand.c +2 -2

@@ -480,10 +540,10 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 ? ? ? ?nand_chip->IO_ADDR_W = host->io_base;
 ? ? ? ?nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl;
 
- ? ? ? if (gpio_is_valid(host->board->rdy_pin))
+ ? ? ? if (gpio_is_valid(host->board.rdy_pin))
 ? ? ? ? ? ? ? ?nand_chip->dev_ready = atmel_nand_device_ready;
 
- ? ? ? nand_chip->ecc.mode = host->board->ecc_mode;
+ ? ? ? nand_chip->ecc.mode = host->board.ecc_mode;
 
 ? ? ? ?regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 ? ? ? ?if (!regs && nand_chip->ecc.mode == NAND_ECC_HW) {

@@ -508,7 +568,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 

? ? ? ?nand_chip->chip_delay = 20; ? ? ? ? ? ? /* 20us command delay time */

- ? ? ? if (host->board->bus_width_16) ?/* 16-bit bus width */
+ ? ? ? if (host->board.bus_width_16) ? /* 16-bit bus width */ ? ? ? ? ? ? ? ?nand_chip->options |= NAND_BUSWIDTH_16;

? ? ? ?nand_chip->read_buf = atmel_read_buf;

drivers/mtd/nand/atmel_nand.c +16 -6

@@ -517,15 +577,15 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 ? ? ? ?platform_set_drvdata(pdev, host);
 ? ? ? ?atmel_nand_enable(host);
 
- ? ? ? if (gpio_is_valid(host->board->det_pin)) {
- ? ? ? ? ? ? ? if (gpio_get_value(host->board->det_pin)) {
+ ? ? ? if (gpio_is_valid(host->board.det_pin)) {
+ ? ? ? ? ? ? ? if (gpio_get_value(host->board.det_pin)) {
 ? ? ? ? ? ? ? ? ? ? ? ?printk(KERN_INFO "No SmartMedia card inserted.\n");
 ? ? ? ? ? ? ? ? ? ? ? ?res = -ENXIO;
 ? ? ? ? ? ? ? ? ? ? ? ?goto err_no_card;
 ? ? ? ? ? ? ? ?}
 ? ? ? ?}
 
- ? ? ? if (host->board->on_flash_bbt || on_flash_bbt) {
+ ? ? ? if (host->board.on_flash_bbt || on_flash_bbt) {
 ? ? ? ? ? ? ? ?printk(KERN_INFO "atmel_nand: Use On Flash BBT\n");
 ? ? ? ? ? ? ? ?nand_chip->bbt_options |= NAND_BBT_USE_FLASH;
 ? ? ? ?}

@@ -600,8 +660,9 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 ? ? ? ?}
 
 ? ? ? ?mtd->name = "atmel_nand";
- ? ? ? res = mtd_device_parse_register(mtd, NULL, 0,
- ? ? ? ? ? ? ? ? ? ? ? host->board->parts, host->board->num_parts);
+ ? ? ? ppdata.of_node = pdev->dev.of_node;
+ ? ? ? res = mtd_device_parse_register(mtd, NULL, &ppdata,
+ ? ? ? ? ? ? ? ? ? ? ? host->board.parts, host->board.num_parts);
 ? ? ? ?if (!res)
 ? ? ? ? ? ? ? ?return res;
 

@@ -645,11 +706,21 @@ static int __exit atmel_nand_remove(struct platform_device *pdev)
 ? ? ? ?return 0;
 ?}
 
+#if defined(CONFIG_OF)
+static const struct of_device_id atmel_nand_dt_ids[] = {
+ ? ? ? { .compatible = "atmel,at91rm9200-nand" },
+ ? ? ? { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, atmel_nand_dt_ids);
+#endif
+
 ?static struct platform_driver atmel_nand_driver = {
 ? ? ? ?.remove ? ? ? ? = __exit_p(atmel_nand_remove),
 ? ? ? ?.driver ? ? ? ? = {
 ? ? ? ? ? ? ? ?.name ? = "atmel_nand",
 ? ? ? ? ? ? ? ?.owner ?= THIS_MODULE,
+ ? ? ? ? ? ? ? .of_match_table = of_match_ptr(atmel_nand_dt_ids),
 ? ? ? ?},
 ?};
 
--

1.7.7

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Hi,

Quoted 21 lines · Jean-Christophe PLAGNIOL-VILLARD

use a local copy of board informatin and fill with DT data

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

---
?.../devicetree/bindings/mtd/atmel-nand.txt ? ? ? ? | ? 41 ++++++++ ?drivers/mtd/nand/atmel_nand.c ? ? ? ? ? ? ? ? ? ? ?| ?107 ++++++++++++++++---- ?2 files changed, 130 insertions(+), 18 deletions(-)
?create mode 100644 Documentation/devicetree/bindings/mtd/atmel-nand.txt

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +3 -0

new file mode 100644
index 0000000..a910ab9
@@ -0,0 +1,41 @@
+Atmel NAND flash
+
+Required properties:

Documentation/devicetree/bindings/mtd/atmel-nand.txt line 13

Quoted 10 lines

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +10 -0

+- compatible : "atmel,at91rm9200-nand".
+- reg : should specify localbus address and size used for the chip,
+ ? ? ? and if availlable the ECC.
+- atmel,nand-addr-offset : offset for the address latch.
+- atmel,nand-cmd-offset : offset for the command latch.
+- #address-cells, #size-cells : Must be present if the device has sub-nodes
+ ?representing partitions.
+
+- gpios : specifies the gpio pins to control the NAND device. detect is an
+ ?optional gpio and may be set to 0 if not present.

What does this mean please? What is 'detect' and what 'control' do the gpios provide?

Below you have two GPIOs pioC 13 and pioC 14. I think the binding should document the two GPIOs, the order, and what they are for.

Quoted 20 lines

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +19 -0

+
+Optional properties:
+- nand-ecc-mode : String, operation mode of the NAND ecc mode, soft by default.
+ ?Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first",
+ ?"soft_bch".
+- nand-bus-width : 8 or 16 bus width if not present 8
+- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false
+
+Examples:
+nand0: nand at 40000000,0 {
+ ? ? ? compatible = "atmel,at91rm9200-nand";
+ ? ? ? #address-cells = <1>;
+ ? ? ? #size-cells = <1>;
+ ? ? ? reg = <0x40000000 0x10000000
+ ? ? ? ? ? ? ?0xffffe800 0x200
+ ? ? ? ? ? ? >;
+ ? ? ? atmel,nand-addr-offset = <21>;
+ ? ? ? atmel,nand-cmd-offset = <22>;
+ ? ? ? nand-on-flash-bbt = <1>;

Documentation/devicetree/bindings/mtd/atmel-nand.txt line 36

Quoted 4 lines

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +4 -0

+ ? ? ? nand-ecc-mode = "soft";
+ ? ? ? gpios = <&pioC 13 0
+ ? ? ? ? ? ? ? ?&pioC 14 0
+ ? ? ? ? ? ? ? ?0

Sorry, I haven't seen this before, perhaps it is a standard thing in Linux. Does 0 mean end of list? Can we not just use the property's size value for this?

- nand-ecc-mode : String, operation mode of the NAND ecc mode. Supported values are: "none", "soft", "hw", "hw_syndrome",
"hw_oob_first", "soft_bch".
- nand-bus-width : 8 or 16 bus width if not present 8
- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false

Hi Jean-Christophe,

Quoted 6 lines · On Monday 06 February 2012 11:35:11 Jean-Christophe PLAGNIOL-VILLARD wrote:

- nand-ecc-mode : String, operation mode of the NAND ecc mode. Supported values are: "none", "soft", "hw", "hw_syndrome",
"hw_oob_first", "soft_bch".
- nand-bus-width : 8 or 16 bus width if not present 8
- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false

Why not use an "empty" type (without argument) for nand-on-flash-bbt then?

Quoted 5 lines

Quoted 2 lines

- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false

Why not use an "empty" type (without argument) for nand-on-flash-bbt then?

I want to be able to disable it

I send a patch to add a helper to manage boolean

this will allow to disable a boolean

    is-ok;          => true
    is-ok = <1>;    => true
    is-ok = <0>;    => false

Quoted 7 lines · On Tuesday 07 February 2012 05:16:06 Jean-Christophe PLAGNIOL-VILLARD wrote:

Quoted 5 lines

Quoted 2 lines

- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false

Why not use an "empty" type (without argument) for nand-on-flash-bbt then?

I want to be able to disable it

Then just don't add this property.

Quoted 8 lines

I send a patch to add a helper to manage boolean

this will allow to disable a boolean

    is-ok;          => true
    is-ok = <1>;    => true
    is-ok = <0>;    => false

- nand-ecc-mode : String, operation mode of the NAND ecc mode. Supported values are: "none", "soft", "hw", "hw_syndrome",
"hw_oob_first", "soft_bch".
- nand-bus-width : 8 or 16 bus width if not present 8
- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Acked-by Grant Likely <[email protected]>

Cc Rob Herring <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

use a local copy of board informatin and fill with DT data

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Acked-by Grant Likely <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

drivers/mtd/nand/atmel_nand.c +41 -0

+{
+	u32 val;
+	int ecc_mode;
+	struct atmel_nand_data *board = &host->board;
+	enum of_gpio_flags flags;
+
+	if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) {
+		if (val >= 32) {
+			dev_err(host->dev, "invalid addr-offset %u\n", val);
+			return -EINVAL;
+		}
+		board->ale = val;
+	}
+
+	if (of_property_read_u32(np, "atmel,nand-cmd-offset", &val) == 0) {
+		if (val >= 32) {
+			dev_err(host->dev, "invalid cmd-offset %u\n", val);
+			return -EINVAL;
+		}
+		board->cle = val;
+	}
+
+	ecc_mode = of_get_nand_ecc_mode(np);
+
+	board->ecc_mode = ecc_mode < 0 ? NAND_ECC_SOFT : ecc_mode;
+
+	board->on_flash_bbt = of_get_nand_on_flash_bbt(np);
+
+	if (of_get_nand_bus_width(np) == 16)
+		board->bus_width_16 = 1;
+
+	board->rdy_pin = of_get_gpio_flags(np, 0, &flags);
+	board->rdy_pin_active_low = (flags == OF_GPIO_ACTIVE_LOW);
+
+	board->enable_pin = of_get_gpio(np, 1);
+	board->det_pin = of_get_gpio(np, 2);
+
+	return 0;
+}
+
 /*
  * Probe for the NAND device.
  */

@@ -479,6 +525,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	struct nand_chip *nand_chip;
 	struct resource *regs;
 	struct resource *mem;
+	struct mtd_part_parser_data ppdata = {};
 	int res;
 
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

On 02/06/2012 11:35 AM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 7 lines

use a local copy of board informatin and fill with DT data

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Acked-by Grant Likely <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

[..]

drivers/mtd/nand/atmel_nand.c static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) · line 477

Quoted 2 lines

drivers/mtd/nand/atmel_nand.c +2 -0

+static int __devinit atmel_of_init_port(struct atmel_nand_host *host,
+					 struct device_node *np)

Maybe you will need to protect this function in case of !DT builds: I suspect that some of the of_xxxxx() calls are not provided if !CONFIG_OF.

Quoted 9 lines

On 02/06/2012 11:35 AM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 7 lines

use a local copy of board informatin and fill with DT data

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Acked-by Grant Likely <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

Quoted 7 lines

[..]

drivers/mtd/nand/atmel_nand.c static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) · line 477

Quoted 2 lines

drivers/mtd/nand/atmel_nand.c +2 -0

+static int __devinit atmel_of_init_port(struct atmel_nand_host *host,
+					 struct device_node *np)

Maybe you will need to protect this function in case of !DT builds: I suspect that some of the of_xxxxx() calls are not provided if !CONFIG_OF.

no-need on the of_ function are static inline it !CONFIG_OF

On 02/07/2012 12:53 PM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 10 lines · Nicolas Ferre

Quoted 9 lines

On 02/06/2012 11:35 AM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 7 lines

use a local copy of board informatin and fill with DT data

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Acked-by Grant Likely <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

Quoted 8 lines

Quoted 7 lines

[..]

drivers/mtd/nand/atmel_nand.c static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) · line 477

Quoted 2 lines

drivers/mtd/nand/atmel_nand.c +2 -0

+static int __devinit atmel_of_init_port(struct atmel_nand_host *host,
+					 struct device_node *np)

Maybe you will need to protect this function in case of !DT builds: I suspect that some of the of_xxxxx() calls are not provided if !CONFIG_OF.

no-need on the of_ function are static inline it !CONFIG_OF

Sorry to come back to this but:

of_get_nand_ecc_mode(np);
of_get_nand_on_flash_bbt(np);

for example are not available in case of non-DT compilation: so we must protect the atmel_of_init_port() against this error.

Can you please rework another patch.

use a local copy of board informatin and fill with DT data

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Acked-by Grant Likely <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

---
V2:
comment from Grant
rebase over rc3

Best Regards,
J.

 .../devicetree/bindings/mtd/atmel-nand.txt         |   41 ++++++++
 drivers/mtd/nand/atmel_nand.c                      |  105 ++++++++++++++++----
 2 files changed, 126 insertions(+), 20 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/atmel-nand.txt

Documentation/devicetree/bindings/mtd/atmel-nand.txt new file +41 -0

new file mode 100644
index 0000000..a910ab9
@@ -0,0 +1,41 @@
+Atmel NAND flash
+
+Required properties:
+- compatible : "atmel,at91rm9200-nand".
+- reg : should specify localbus address and size used for the chip,
+	and if availlable the ECC.
+- atmel,nand-addr-offset : offset for the address latch.
+- atmel,nand-cmd-offset : offset for the command latch.
+- #address-cells, #size-cells : Must be present if the device has sub-nodes
+  representing partitions.
+
+- gpios : specifies the gpio pins to control the NAND device. detect is an
+  optional gpio and may be set to 0 if not present.
+
+Optional properties:
+- nand-ecc-mode : String, operation mode of the NAND ecc mode, soft by default.
+  Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first",
+  "soft_bch".
+- nand-bus-width : 8 or 16 bus width if not present 8
+- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false
+
+Examples:
+nand0: nand at 40000000,0 {
+	compatible = "atmel,at91rm9200-nand";
+	#address-cells = <1>;
+	#size-cells = <1>;
+	reg = <0x40000000 0x10000000
+	       0xffffe800 0x200
+	      >;
+	atmel,nand-addr-offset = <21>;
+	atmel,nand-cmd-offset = <22>;
+	nand-on-flash-bbt = <1>;
+	nand-ecc-mode = "soft";
+	gpios = <&pioC 13 0
+		 &pioC 14 0
+		 0
+		>;
+	partition at 0 {
+		...
+	};
+};

drivers/mtd/nand/atmel_nand.c +85 -20

index 045d174..7f91ed2 100644
@@ -27,6 +27,10 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/of_mtd.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>

@@ -83,7 +87,7 @@ struct atmel_nand_host {
 	struct mtd_info		mtd;
 	void __iomem		*io_base;
 	dma_addr_t		io_phys;
-	struct atmel_nand_data	*board;
+	struct atmel_nand_data	board;
 	struct device		*dev;
 	void __iomem		*ecc;
 

@@ -101,8 +105,8 @@ static int cpu_has_dma(void)
  */
 static void atmel_nand_enable(struct atmel_nand_host *host)
 {
-	if (gpio_is_valid(host->board->enable_pin))
-		gpio_set_value(host->board->enable_pin, 0);
+	if (gpio_is_valid(host->board.enable_pin))
+		gpio_set_value(host->board.enable_pin, 0);
 }
 
 /*

@@ -110,8 +114,8 @@ static void atmel_nand_enable(struct atmel_nand_host *host)
  */
 static void atmel_nand_disable(struct atmel_nand_host *host)
 {
-	if (gpio_is_valid(host->board->enable_pin))
-		gpio_set_value(host->board->enable_pin, 1);
+	if (gpio_is_valid(host->board.enable_pin))
+		gpio_set_value(host->board.enable_pin, 1);
 }
 
 /*

@@ -132,9 +136,9 @@ static void atmel_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl
 		return;
 
 	if (ctrl & NAND_CLE)
-		writeb(cmd, host->io_base + (1 << host->board->cle));
+		writeb(cmd, host->io_base + (1 << host->board.cle));
 	else
-		writeb(cmd, host->io_base + (1 << host->board->ale));
+		writeb(cmd, host->io_base + (1 << host->board.ale));
 }
 
 /*

@@ -145,8 +149,8 @@ static int atmel_nand_device_ready(struct mtd_info *mtd)
 	struct nand_chip *nand_chip = mtd->priv;
 	struct atmel_nand_host *host = nand_chip->priv;
 
-	return gpio_get_value(host->board->rdy_pin) ^
-                !!host->board->rdy_pin_active_low;
+	return gpio_get_value(host->board.rdy_pin) ^
+                !!host->board.rdy_pin_active_low;
 }
 
 /*

@@ -261,7 +265,7 @@ static void atmel_read_buf(struct mtd_info *mtd, u8 *buf, int len)
 		if (atmel_nand_dma_op(mtd, buf, len, 1) == 0)
 			return;
 
-	if (host->board->bus_width_16)
+	if (host->board.bus_width_16)
 		atmel_read_buf16(mtd, buf, len);
 	else
 		atmel_read_buf8(mtd, buf, len);

@@ -277,7 +281,7 @@ static void atmel_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
 		if (atmel_nand_dma_op(mtd, (void *)buf, len, 0) == 0)
 			return;
 
-	if (host->board->bus_width_16)
+	if (host->board.bus_width_16)
 		atmel_write_buf16(mtd, buf, len);
 	else
 		atmel_write_buf8(mtd, buf, len);

@@ -469,6 +473,48 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)
 	}
 }
 
+static int __devinit atmel_of_init_port(struct atmel_nand_host *host,
+					 struct device_node *np)
+{
+	u32 val;
+	int ecc_mode;
+	struct atmel_nand_data *board = &host->board;
+	enum of_gpio_flags flags;
+
+	if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) {
+		if (val >= 32) {
+			dev_err(host->dev, "invalid addr-offset %u\n", val);
+			return -EINVAL;
+		}
+		board->ale = val;
+	}
+
+	if (of_property_read_u32(np, "atmel,nand-cmd-offset", &val) == 0) {
+		if (val >= 32) {
+			dev_err(host->dev, "invalid cmd-offset %u\n", val);
+			return -EINVAL;
+		}
+		board->cle = val;
+	}
+
+	ecc_mode = of_get_nand_ecc_mode(np);
+
+	board->ecc_mode = ecc_mode < 0 ? NAND_ECC_SOFT : ecc_mode;
+
+	board->on_flash_bbt = of_get_nand_on_flash_bbt(np);
+
+	if (of_get_nand_bus_width(np) == 16)
+		board->bus_width_16 = 1;
+
+	board->rdy_pin = of_get_gpio_flags(np, 0, &flags);
+	board->rdy_pin_active_low = (flags == OF_GPIO_ACTIVE_LOW);
+
+	board->enable_pin = of_get_gpio(np, 1);
+	board->det_pin = of_get_gpio(np, 2);
+
+	return 0;
+}
+
 /*
  * Probe for the NAND device.
  */

@@ -479,6 +525,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	struct nand_chip *nand_chip;
 	struct resource *regs;
 	struct resource *mem;
+	struct mtd_part_parser_data ppdata = {};
 	int res;
 
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

@@ -505,8 +552,15 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
 	mtd = &host->mtd;
 	nand_chip = &host->nand_chip;
-	host->board = pdev->dev.platform_data;
 	host->dev = &pdev->dev;
+	if (pdev->dev.of_node) {
+		res = atmel_of_init_port(host, pdev->dev.of_node);
+		if (res)
+			goto err_nand_ioremap;
+	} else {
+		memcpy(&host->board, pdev->dev.platform_data,
+		       sizeof(struct atmel_nand_data));
+	}
 
 	nand_chip->priv = host;		/* link the private data structures */
 	mtd->priv = nand_chip;

@@ -517,10 +571,10 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	nand_chip->IO_ADDR_W = host->io_base;
 	nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl;
 
-	if (gpio_is_valid(host->board->rdy_pin))
+	if (gpio_is_valid(host->board.rdy_pin))
 		nand_chip->dev_ready = atmel_nand_device_ready;
 
-	nand_chip->ecc.mode = host->board->ecc_mode;
+	nand_chip->ecc.mode = host->board.ecc_mode;
 
 	regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	if (!regs && nand_chip->ecc.mode == NAND_ECC_HW) {

@@ -545,7 +599,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
 	nand_chip->chip_delay = 20;		/* 20us command delay time */
 
-	if (host->board->bus_width_16)	/* 16-bit bus width */
+	if (host->board.bus_width_16)	/* 16-bit bus width */
 		nand_chip->options |= NAND_BUSWIDTH_16;
 
 	nand_chip->read_buf = atmel_read_buf;

@@ -554,15 +608,15 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, host);
 	atmel_nand_enable(host);
 
-	if (gpio_is_valid(host->board->det_pin)) {
-		if (gpio_get_value(host->board->det_pin)) {
+	if (gpio_is_valid(host->board.det_pin)) {
+		if (gpio_get_value(host->board.det_pin)) {
 			printk(KERN_INFO "No SmartMedia card inserted.\n");
 			res = -ENXIO;
 			goto err_no_card;
 		}
 	}
 
-	if (host->board->on_flash_bbt || on_flash_bbt) {
+	if (host->board.on_flash_bbt || on_flash_bbt) {
 		printk(KERN_INFO "atmel_nand: Use On Flash BBT\n");
 		nand_chip->bbt_options |= NAND_BBT_USE_FLASH;
 	}

@@ -637,8 +691,9 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	}
 
 	mtd->name = "atmel_nand";
-	res = mtd_device_parse_register(mtd, NULL, 0,
-			host->board->parts, host->board->num_parts);
+	ppdata.of_node = pdev->dev.of_node;
+	res = mtd_device_parse_register(mtd, NULL, &ppdata,
+			host->board.parts, host->board.num_parts);
 	if (!res)
 		return res;
 

@@ -682,11 +737,21 @@ static int __exit atmel_nand_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id atmel_nand_dt_ids[] = {
+	{ .compatible = "atmel,at91rm9200-nand" },
+	{ /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, atmel_nand_dt_ids);
+#endif
+
 static struct platform_driver atmel_nand_driver = {
 	.remove		= __exit_p(atmel_nand_remove),
 	.driver		= {
 		.name	= "atmel_nand",
 		.owner	= THIS_MODULE,
+		.of_match_table	= of_match_ptr(atmel_nand_dt_ids),
 	},
 };
 

Signature · 1 line

1.7.7

HI David,
I've depeancy on other at91 patch can I apply this series via at91 tree?

Use a local copy of board informatin and fill with DT data.

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Acked-by Grant Likely <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

---
v3:

protect against !CONFIG_OF

Best Regards,
J.

 .../devicetree/bindings/mtd/atmel-nand.txt         |   41 +++++++
 arch/arm/boot/dts/at91sam9g20.dtsi                 |   17 +++
 arch/arm/boot/dts/at91sam9g45.dtsi                 |   17 +++
 arch/arm/boot/dts/at91sam9m10g45ek.dts             |   26 +++++-
 arch/arm/boot/dts/usb_a9g20.dts                    |   46 ++++++++-
 arch/arm/mach-at91/at91sam9x5.c                    |    5 -

 arch/arm/mach-at91/board-dt.c                      |   52 ---------
 drivers/mtd/nand/atmel_nand.c                      |  113 ++++++++++++++++----
 8 files changed, 238 insertions(+), 79 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/atmel-nand.txt

On 02/21/2012 10:46 AM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 12 lines

Use a local copy of board informatin and fill with DT data.

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Acked-by Grant Likely <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc devicetree-discuss at lists.ozlabs.org

Cc linux-mtd at lists.infradead.org

---
v3:

protect against !CONFIG_OF

Quoted 8 lines

Best Regards,
J.

 .../devicetree/bindings/mtd/atmel-nand.txt         |   41 +++++++
 arch/arm/boot/dts/at91sam9g20.dtsi                 |   17 +++
 arch/arm/boot/dts/at91sam9g45.dtsi                 |   17 +++
 arch/arm/boot/dts/at91sam9m10g45ek.dts             |   26 +++++-
 arch/arm/boot/dts/usb_a9g20.dts                    |   46 ++++++++-
 arch/arm/mach-at91/at91sam9x5.c                    |    5 -

As we will put this series on top of 9x5, we may also add the entries in at91sam9x5.dtsi / at91sam9x5cm.dtsi ...

Quoted 5 lines

 arch/arm/mach-at91/board-dt.c                      |   52 ---------
 drivers/mtd/nand/atmel_nand.c                      |  113 ++++++++++++++++----
 8 files changed, 238 insertions(+), 79 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/atmel-nand.txt

Otherwise,

Acked-by Nicolas Ferre <[email protected]>

Bye,

Signature · 6 lines

Nicolas Ferre

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel