From 5eaa6b8103be45921d64e670385ef1887f88d60c Mon Sep 17 00:00:00 2001
From: Joe Schaack <jschaack@xes-inc.com>
Date: Thu, 21 Feb 2013 16:29:45 -0600
Subject: [PATCH] --- yaml --- r: 374726 b: refs/heads/master c:
 05ff8c258c76dd469232a03ec8d45f7e7267e0ac h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../devicetree/bindings/mtd/partition.txt     | 36 +++++++++++++++++--
 trunk/drivers/mtd/ofpart.c                    |  7 ++--
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 44a85bbeb35a..8a47050833c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e66e280c36e09e4573089862e7dc2ade9e680088
+refs/heads/master: 05ff8c258c76dd469232a03ec8d45f7e7267e0ac
diff --git a/trunk/Documentation/devicetree/bindings/mtd/partition.txt b/trunk/Documentation/devicetree/bindings/mtd/partition.txt
index 6e1f61f1e789..9315ac96b49b 100644
--- a/trunk/Documentation/devicetree/bindings/mtd/partition.txt
+++ b/trunk/Documentation/devicetree/bindings/mtd/partition.txt
@@ -5,8 +5,12 @@ 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.
+#address-cells & #size-cells must both be present in the mtd device. There are
+two valid values for both:
+<1>: for partitions that require a single 32-bit cell to represent their
+     size/address (aka the value is below 4 GiB)
+<2>: for partitions that require two 32-bit cells to represent their
+     size/address (aka the value is 4 GiB or greater).
 
 Required properties:
 - reg : The partition's offset and size within the mtd bank.
@@ -36,3 +40,31 @@ flash@0 {
 		reg = <0x0100000 0x200000>;
 	};
 };
+
+flash@1 {
+	#address-cells = <1>;
+	#size-cells = <2>;
+
+	/* a 4 GiB partition */
+	partition@0 {
+		label = "filesystem";
+		reg = <0x00000000 0x1 0x00000000>;
+	};
+};
+
+flash@2 {
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	/* an 8 GiB partition */
+	partition@0 {
+		label = "filesystem #1";
+		reg = <0x0 0x00000000 0x2 0x00000000>;
+	};
+
+	/* a 4 GiB partition */
+	partition@200000000 {
+		label = "filesystem #2";
+		reg = <0x2 0x00000000 0x1 0x00000000>;
+	};
+};
diff --git a/trunk/drivers/mtd/ofpart.c b/trunk/drivers/mtd/ofpart.c
index 30bd907a260a..553d6d6d5603 100644
--- a/trunk/drivers/mtd/ofpart.c
+++ b/trunk/drivers/mtd/ofpart.c
@@ -55,6 +55,7 @@ static int parse_ofpart_partitions(struct mtd_info *master,
 	while ((pp = of_get_next_child(node, pp))) {
 		const __be32 *reg;
 		int len;
+		int a_cells, s_cells;
 
 		reg = of_get_property(pp, "reg", &len);
 		if (!reg) {
@@ -62,8 +63,10 @@ static int parse_ofpart_partitions(struct mtd_info *master,
 			continue;
 		}
 
-		(*pparts)[i].offset = be32_to_cpu(reg[0]);
-		(*pparts)[i].size = be32_to_cpu(reg[1]);
+		a_cells = of_n_addr_cells(pp);
+		s_cells = of_n_size_cells(pp);
+		(*pparts)[i].offset = of_read_number(reg, a_cells);
+		(*pparts)[i].size = of_read_number(reg + a_cells, s_cells);
 
 		partname = of_get_property(pp, "label", &len);
 		if (!partname)