From 33b2550b0d62762eb68c502b1e1d5816b06ed5f1 Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Thu, 16 Apr 2009 15:11:54 -0600
Subject: [PATCH] --- yaml --- r: 143839 b: refs/heads/master c:
 c5a88dd90cf243a17c4a8c10e1ed973192ea5825 h: refs/heads/master i:   143837:
 56aab442a8f959f035427f5b263ed24c087a6bbe   143835:
 3340e056b6bd45b86eb118ea0d588bb09d830d8a   143831:
 ceafffc61aed72bfcdeaba2e58f7184d4aef165e   143823:
 cf5f7df5e9ec95e0607e3ff6bdf848d0ed390101   143807:
 edc985ced86956e449dc6b5ca384afad7ab111e1 v: v3

---
 [refs]                                        |  2 +-
 .../powerpc/dts-bindings/mtd-physmap.txt      | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d40533846d87..7f410f902bbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efcc2da3fd148c9acb7d7cf1d9800e0649f950fc
+refs/heads/master: c5a88dd90cf243a17c4a8c10e1ed973192ea5825
diff --git a/trunk/Documentation/powerpc/dts-bindings/mtd-physmap.txt b/trunk/Documentation/powerpc/dts-bindings/mtd-physmap.txt
index cd474f9aef39..667c9bde8699 100644
--- a/trunk/Documentation/powerpc/dts-bindings/mtd-physmap.txt
+++ b/trunk/Documentation/powerpc/dts-bindings/mtd-physmap.txt
@@ -5,7 +5,9 @@ file systems on embedded devices.
 
  - compatible : should contain the specific model of flash chip(s)
    used, if known, followed by either "cfi-flash" or "jedec-flash"
- - reg : Address range of the flash chip
+ - reg : Address range(s) of the flash chip(s)
+   It's possible to (optionally) define multiple "reg" tuples so that
+   non-identical NOR chips can be described in one flash node.
  - bank-width : Width (in bytes) of the flash bank.  Equal to the
    device width times the number of interleaved chips.
  - device-width : (optional) Width of a single flash chip.  If
@@ -61,3 +63,18 @@ Example:
 			read-only;
 		};
 	};
+
+Here an example with multiple "reg" tuples:
+
+	flash@f0000000,0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "intel,PC48F4400P0VB", "cfi-flash";
+		reg = <0 0x00000000 0x02000000
+		       0 0x02000000 0x02000000>;
+		bank-width = <2>;
+		partition@0 {
+			label = "test-part1";
+			reg = <0 0x04000000>;
+		};
+	};