---

yaml
---
r: 297759
b: refs/heads/master
c: 714daf7
h: refs/heads/master
i:
  297757: adc6315
  297755: fa07fa5
  297751: bfc9329
  297743: 515cade
  297727: 0ae27b2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e152c38abaa92352679c9b53c4cce533c03997c6
+refs/heads/master: 714daf73d0889c62e90abf4510e4fab65b4668e8

trunk/Documentation/devicetree/bindings/mtd/arm-versatile.txt

@@ -4,5 +4,5 @@ Required properties:
 - compatible : must be "arm,versatile-flash";
 - bank-width : width in bytes of flash interface.
 
-The device tree may optionally contain sub-nodes describing partitions of the
-address space. See partition.txt for more detail.
+Optional properties:
+- Subnode partition map from mtd flash binding

trunk/Documentation/devicetree/bindings/mtd/atmel-dataflash.txt

@@ -3,9 +3,6 @@
 Required properties:
 - compatible : "atmel,<model>", "atmel,<series>", "atmel,dataflash".
 
-The device tree may optionally contain sub-nodes describing partitions of the
-address space. See partition.txt for more detail.
-
 Example:
 
 flash@1 {

trunk/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt

@@ -19,10 +19,6 @@ Optional properties:
 	read registers (tR). Required if property "gpios" is not used
 	(R/B# pins not connected).
 
-Each flash chip described may optionally contain additional sub-nodes
-describing partitions of the address space. See partition.txt for more
-detail.
-
 Examples:
 
 upm@1,0 {

trunk/Documentation/devicetree/bindings/mtd/gpio-control-nand.txt

@@ -25,9 +25,6 @@ Optional properties:
   GPIO state and before and after command byte writes, this register will be
   read to ensure that the GPIO accesses have completed.
 
-The device tree may optionally contain sub-nodes describing partitions of the
-address space. See partition.txt for more detail.
-
 Examples:
 
 gpio-nand@1,0 {

trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt

@@ -23,8 +23,27 @@ are defined:
  - vendor-id : Contains the flash chip's vendor id (1 byte).
  - device-id : Contains the flash chip's device id (1 byte).
 
-The device tree may optionally contain sub-nodes describing partitions of the
-address space. See partition.txt for more detail.
+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.
 
 Example: