Add support for DNS-320 and DNS-325 using devicetree

Add support for the DNS-320 and DNS-325. Describe as much as currently possible in the devicetree files, create a board-dnskw.c for everything else.

Signed-off-by Jamie Lentin <[email protected]>

Quoted 5 lines · Jamie Lentin

Add support for the DNS-320 and DNS-325. Describe as much as currently possible in the devicetree files, create a board-dnskw.c for everything else.

Signed-off-by Jamie Lentin <[email protected]>

Looks good to me.

Jason, do you want to add these to your tree? You are already have some the patches for dreamplug, and I think it makes sense to update these two together when you have more patches.

Since the dnskw board file contains mostly gpio setup, I think it would be good if one of you could take that part on next: once the gpio controller uses DT probing, you can move all the gpio leds and buttons into the device tree, which drastically shrinks the dnskw file.

Acked-by Arnd Bergmann <[email protected]>

Arnd

Convert orion-nand to use fdt and add common setup to kirkwood.dtsi, including a default value for chip-delay (all current boards seem to use 25 anyway).

Add placeholder documentation for the bindings, for someone more knowledgable than me to fill in the details of the properties.

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

new file mode 100644
index 0000000..d347999
@@ -0,0 +1,46 @@
+NAND support for Marvell Orion SoC platforms
+

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

+Examples:
+
+nand at f4000000 {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	cle = <0>;
+	ale = <1>;

Re-arranged documentation as you suggest, however it's tempting to have this as a separate patch and add references to partition.txt for the other binding documentation files. Let me know if you want me to do this.

Convert orion-nand to use fdt and add common setup to kirkwood.dtsi, including a default value for chip-delay (all current boards seem to use 25 anyway).

Add placeholder documentation for the bindings, for someone more knowledgable than me to fill in the details of the properties.

Move common partition table documentation into a separate file and reference this.

Signed-off-by Jamie Lentin <[email protected]>

---
Re-arranged documentation as you suggest, however it's tempting to have this as a separate patch and add references to partition.txt for the other binding documentation files. Let me know if you want me to do this.

Cheers for your help!

 .../devicetree/bindings/mtd/mtd-physmap.txt        |   24 +--------
 .../devicetree/bindings/mtd/orion-nand.txt         |   50 ++++++++++++++++++++
 .../devicetree/bindings/mtd/partition.txt          |   38 +++++++++++++++
 arch/arm/boot/dts/kirkwood.dtsi                    |   15 ++++++-
 arch/arm/mach-kirkwood/common.c                    |   12 +++++
 drivers/mtd/nand/orion_nand.c                      |   34 +++++++++++++-
 6 files changed, 149 insertions(+), 24 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/orion-nand.txt
 create mode 100644 Documentation/devicetree/bindings/mtd/partition.txt

Documentation/devicetree/bindings/mtd/mtd-physmap.txt +3 -21

index 80152cb..9b873d4 100644
@@ -23,27 +23,9 @@ are defined:
  - vendor-id : Contains the flash chip's vendor id (1 byte).
  - device-id : Contains the flash chip's device id (1 byte).
 
-In addition to the information on the mtd bank itself, the
-device tree may optionally contain additional information
-describing partitions of the address space.  This can be
-used on platforms which have strong conventions about which
-portions of a flash are used for what purposes, but which don't
-use an on-flash partition table such as RedBoot.
-
-Each partition is represented as a sub-node of the mtd device.
-Each node's name represents the name of the corresponding
-partition of the mtd device.
-
-Flash partitions
- - reg : The partition's offset and size within the mtd bank.
- - label : (optional) The label / name for this partition.
-   If omitted, the label is taken from the node name (excluding
-   the unit address).
- - read-only : (optional) This parameter, if present, is a hint to
-   Linux that this partition should only be mounted
-   read-only.  This is usually used for flash partitions
-   containing early-boot firmware images or data which should not
-   be clobbered.
+In addition to the information on the mtd bank itself, the device tree may
+optionally contain additional sub-nodes describing partitions of the address
+space. See partition.txt for more detail.
 
 Example:
 

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

new file mode 100644
index 0000000..e9acbd2
@@ -0,0 +1,50 @@
+NAND support for Marvell Orion SoC platforms
+
+Required properties:
+- compatible : "mrvl,orion-nand".
+- reg : Base physical address of the NAND and length of memory mapped
+	region
+
+Optional properties:
+- cle :
+- ale :
+- bank-width :
+- chip-delay :
+
+In addition to the information on the mtd bank itself, the device tree may
+optionally contain additional sub-nodes describing partitions of the address
+space. See partition.txt for more detail.
+
+Examples:
+
+nand at f4000000 {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	cle = <0>;
+	ale = <1>;
+	bank-width = <8>;
+	chip-delay = <25>;
+	compatible = "mrvl,orion-nand";
+	reg = <0xf4000000 0x400>;
+
+	partition at 0 {
+		label = "u-boot";
+		reg = <0x0000000 0x100000>;
+		read-only;
+	};
+
+	partition at 100000 {
+		label = "uImage";
+		reg = <0x0100000 0x200000>;
+	};
+
+	partition at 300000 {
+		label = "dtb";
+		reg = <0x0300000 0x100000>;
+	};
+
+	partition at 400000 {
+		label = "root";
+		reg = <0x0400000 0x7d00000>;
+	};
+};

Documentation/devicetree/bindings/mtd/partition.txt new file +38 -0

new file mode 100644
index 0000000..f114ce1
@@ -0,0 +1,38 @@
+Representing flash partitions in devicetree
+
+Partitions can be represented by sub-nodes of an mtd device. This can be used
+on platforms which have strong conventions about which portions of a flash are
+used for what purposes, but which don't use an on-flash partition table such
+as RedBoot.
+
+#address-cells & #size-cells must both be present in the mtd device and be
+equal to 1.
+
+Required properties:
+- reg : The partition's offset and size within the mtd bank.
+
+Optional properties:
+- label : The label / name for this partition.  If omitted, the label is taken
+  from the node name (excluding the unit address).
+- read-only : This parameter, if present, is a hint to Linux that this
+  partition should only be mounted read-only. This is usually used for flash
+  partitions containing early-boot firmware images or data which should not be
+  clobbered.
+
+Examples:
+
+
+flash at 0 {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	partition at 0 {
+		label = "u-boot";
+		reg = <0x0000000 0x100000>;
+		read-only;
+	};
+
+	uimage at 100000 {
+		reg = <0x0100000 0x200000>;
+	};
+];

arch/arm/boot/dts/kirkwood.dtsi +14 -1

index 3474ef8..6b80374 100644
@@ -5,7 +5,7 @@
 
 	ocp at f1000000 {
 		compatible = "simple-bus";
-		ranges = <0 0xf1000000 0x1000000>;
+		ranges = <0 0xf1000000 0x4000000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 

@@ -32,5 +32,18 @@
 			reg = <0x10300 0x20>;
 			interrupts = <53>;
 		};
+
+		nand at 3000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			cle = <0>;
+			ale = <1>;
+			bank-width = <8>;
+			compatible = "mrvl,orion-nand";
+			reg = <0x3000000 0x400>;
+			chip-delay = <25>;
+			/* set partition map and/or chip-delay in board dts */
+			status = "disabled";
+		};
 	};
 };

arch/arm/mach-kirkwood/common.c +12 -0

index a02cae8..3ad0373 100644
@@ -15,6 +15,7 @@
 #include <linux/ata_platform.h>
 #include <linux/mtd/nand.h>
 #include <linux/dma-mapping.h>
+#include <linux/of.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/timex.h>

@@ -482,6 +483,9 @@ static int __init kirkwood_clock_gate(void)
 	unsigned int curr = readl(CLOCK_GATING_CTRL);
 	u32 dev, rev;
 
+#ifdef CONFIG_OF
+	struct device_node *np;
+#endif
 	kirkwood_pcie_id(&dev, &rev);
 	printk(KERN_DEBUG "Gating clock of unused units\n");
 	printk(KERN_DEBUG "before: 0x%08x\n", curr);

@@ -489,6 +493,14 @@ static int __init kirkwood_clock_gate(void)
 	/* Make sure those units are accessible */
 	writel(curr | CGC_SATA0 | CGC_SATA1 | CGC_PEX0 | CGC_PEX1, CLOCK_GATING_CTRL);
 
+#ifdef CONFIG_OF
+	np = of_find_compatible_node(NULL, NULL, "mrvl,orion-nand");
+	if (np && of_device_is_available(np)) {
+		kirkwood_clk_ctrl |= CGC_RUNIT;
+		of_node_put(np);
+	}
+#endif
+
 	/* For SATA: first shutdown the phy */
 	if (!(kirkwood_clk_ctrl & CGC_SATA0)) {
 		/* Disable PLL and IVREF */

drivers/mtd/nand/orion_nand.c +32 -2

index 29f505a..6a5f47b 100644
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>

@@ -74,11 +75,13 @@ static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
 static int __init orion_nand_probe(struct platform_device *pdev)
 {
 	struct mtd_info *mtd;
+	struct mtd_part_parser_data ppdata = {};
 	struct nand_chip *nc;
 	struct orion_nand_data *board;
 	struct resource *res;
 	void __iomem *io_base;
 	int ret = 0;
+	u32 val = 0;
 
 	nc = kzalloc(sizeof(struct nand_chip) + sizeof(struct mtd_info), GFP_KERNEL);
 	if (!nc) {

@@ -101,7 +104,25 @@ static int __init orion_nand_probe(struct platform_device *pdev)
 		goto no_res;
 	}
 
-	board = pdev->dev.platform_data;
+	if (pdev->dev.of_node) {
+		board = devm_kzalloc(&pdev->dev, sizeof(struct orion_nand_data),
+					GFP_KERNEL);
+		if (!board) {
+			printk(KERN_ERR "orion_nand: failed to allocate board structure.\n");
+			ret = -ENOMEM;
+			goto no_res;
+		}
+		if (!of_property_read_u32(pdev->dev.of_node, "cle", &val))
+			board->cle = (u8)val;
+		if (!of_property_read_u32(pdev->dev.of_node, "ale", &val))
+			board->ale = (u8)val;
+		if (!of_property_read_u32(pdev->dev.of_node, "bank-width", &val))
+			board->width = (u8)val;
+		if (!of_property_read_u32(pdev->dev.of_node,
+						"chip-delay", &val))
+			board->chip_delay = (u8)val;
+	} else
+		board = pdev->dev.platform_data;
 
 	mtd->priv = nc;
 	mtd->owner = THIS_MODULE;

@@ -129,7 +150,8 @@ static int __init orion_nand_probe(struct platform_device *pdev)
 	}
 
 	mtd->name = "orion_nand";
-	ret = mtd_device_parse_register(mtd, NULL, 0,
+	ppdata.of_node = pdev->dev.of_node;
+	ret = mtd_device_parse_register(mtd, NULL, &ppdata,
 			board->parts, board->nr_parts);
 	if (ret) {
 		nand_release(mtd);

@@ -161,11 +183,19 @@ static int __devexit orion_nand_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id orion_nand_of_match_table[] = {
+	{ .compatible = "mrvl,orion-nand", },
+	{},
+};
+#endif
+
 static struct platform_driver orion_nand_driver = {
 	.remove		= __devexit_p(orion_nand_remove),
 	.driver		= {
 		.name	= "orion_nand",
 		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(orion_nand_of_match_table),
 	},
 };
 

Signature · 1 line

1.7.9.1

Use devicetree to define NAND partitions. Use D-link partition scheme by default, to be vaguely compatible with their userland.

Signed-off-by Jamie Lentin <[email protected]>

Use devicetree to define NAND partitions. Use D-link partition scheme by default, to be vaguely compatible with their userland.

Signed-off-by Jamie Lentin <[email protected]>

---
 arch/arm/boot/dts/kirkwood-dns320.dts |   35 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-dns325.dts |   35 +++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-dnskw.c  |   31 -----------------------------
 3 files changed, 70 insertions(+), 31 deletions(-)

arch/arm/boot/dts/kirkwood-dns320.dts +0 -0

index 58de7f2..fbf55ff 100644

Quoted 10 lines · Jamie Lentin

Use devicetree to define NAND partitions. Use D-link partition scheme by default, to be vaguely compatible with their userland.

Signed-off-by Jamie Lentin <[email protected]>

---
 arch/arm/boot/dts/kirkwood-dns320.dts |   35 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-dns325.dts |   35 +++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-dnskw.c  |   31 -----------------------------
 3 files changed, 70 insertions(+), 31 deletions(-)

arch/arm/boot/dts/kirkwood-dns320.dts line 31

Quoted 12 lines

arch/arm/boot/dts/kirkwood-dns320.dts +4 -0

index 58de7f2..fbf55ff 100644
@@ -25,5 +25,40 @@
 			clock-frequency = <166666667>;
 			status = "ok";
 		};
+
+		nand at 3000000 {
+			status = "ok";
+

This should be "okay", not "ok" -- see IEEE1275. Or just leave it out.

Quoted 11 lines · Scott Wood

Quoted 10 lines · Jamie Lentin

Use devicetree to define NAND partitions. Use D-link partition scheme by default, to be vaguely compatible with their userland.

Signed-off-by Jamie Lentin <[email protected]>

---
 arch/arm/boot/dts/kirkwood-dns320.dts |   35 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-dns325.dts |   35 +++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-dnskw.c  |   31 -----------------------------
 3 files changed, 70 insertions(+), 31 deletions(-)

Quoted 14 lines

arch/arm/boot/dts/kirkwood-dns320.dts line 31

Quoted 12 lines

arch/arm/boot/dts/kirkwood-dns320.dts +4 -0

index 58de7f2..fbf55ff 100644
@@ -25,5 +25,40 @@
 			clock-frequency = <166666667>;
 			status = "ok";
 		};
+
+		nand at 3000000 {
+			status = "ok";
+

This should be "okay", not "ok" -- see IEEE1275. Or just leave it out.

Ack, but it needs to be there. Most, but not all, kirkwood boards have nand, so we define it in kirkwood.dtsi and set it as disabled. Individual boards can then enable it as needed.

As for 'okay', looks like we may need to patch of_device_is_available() in drivers/of/base.c (~284) if we want to be consistent with IEEE1275.

Quoted 27 lines · Jason Cooper

Quoted 11 lines · Scott Wood

Quoted 10 lines · Jamie Lentin

Use devicetree to define NAND partitions. Use D-link partition scheme by default, to be vaguely compatible with their userland.

Signed-off-by Jamie Lentin <[email protected]>

---
 arch/arm/boot/dts/kirkwood-dns320.dts |   35 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-dns325.dts |   35 +++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-dnskw.c  |   31 -----------------------------
 3 files changed, 70 insertions(+), 31 deletions(-)

Quoted 14 lines

arch/arm/boot/dts/kirkwood-dns320.dts line 31

Quoted 12 lines

arch/arm/boot/dts/kirkwood-dns320.dts +4 -0

index 58de7f2..fbf55ff 100644
@@ -25,5 +25,40 @@
 			clock-frequency = <166666667>;
 			status = "ok";
 		};
+
+		nand at 3000000 {
+			status = "ok";
+

This should be "okay", not "ok" -- see IEEE1275. Or just leave it out.

Quoted 6 lines

Ack, but it needs to be there. Most, but not all, kirkwood boards have nand, so we define it in kirkwood.dtsi and set it as disabled. Individual boards can then enable it as needed.

As for 'okay', looks like we may need to patch of_device_is_available() in drivers/of/base.c (~284) if we want to be consistent with IEEE1275.

No need to change of_device_is_available() -- it handles the standards-compliant "okay" as well as "ok" which is non-compliant but probably exists in some broken real OF trees (and even if not, it's bad to break compatibility with older device trees without a good reason).

Maybe add a comment indicating which should be used.

-Scott

Quoted 40 lines · Scott Wood

Quoted 27 lines · Jason Cooper

Quoted 11 lines · Scott Wood

Quoted 10 lines · Jamie Lentin

Use devicetree to define NAND partitions. Use D-link partition scheme by default, to be vaguely compatible with their userland.

Signed-off-by Jamie Lentin <[email protected]>

---

arch/arm/boot/dts/kirkwood-dns320.dts |   35 +++++++++++++++++++++++++++++++++
arch/arm/boot/dts/kirkwood-dns325.dts |   35 +++++++++++++++++++++++++++++++++
arch/arm/mach-kirkwood/board-dnskw.c  |   31 -----------------------------
3 files changed, 70 insertions(+), 31 deletions(-)

Quoted 14 lines

arch/arm/boot/dts/kirkwood-dns320.dts line 31

Quoted 12 lines

arch/arm/boot/dts/kirkwood-dns320.dts +4 -0

index 58de7f2..fbf55ff 100644
@@ -25,5 +25,40 @@
 			clock-frequency = <166666667>;
 			status = "ok";
 		};
+
+		nand at 3000000 {
+			status = "ok";
+

This should be "okay", not "ok" -- see IEEE1275. Or just leave it out.

Quoted 6 lines

Ack, but it needs to be there. Most, but not all, kirkwood boards have nand, so we define it in kirkwood.dtsi and set it as disabled. Individual boards can then enable it as needed.

As for 'okay', looks like we may need to patch of_device_is_available() in drivers/of/base.c (~284) if we want to be consistent with IEEE1275.

No need to change of_device_is_available() -- it handles the standards-compliant "okay" as well as "ok" which is non-compliant but probably exists in some broken real OF trees (and even if not, it's bad to break compatibility with older device trees without a good reason).

Quoted 1 line

Maybe add a comment indicating which should be used.

I need to re-jig this part anyway, so will update to "okay" too---looks like a fairly harmless change.

Would it make sense to change drivers/of/base.c to emit a warning if "ok" is used? Or are there already too many devicetrees in the wild that use "ok"?