diff options
author | Brian Norris <computersforpeace@gmail.com> | 2015-12-09 09:59:45 -0800 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2015-12-09 10:00:34 -0800 |
commit | 2027cba66a0591e65a64d3ecfe8a3aa2f55a681b (patch) | |
tree | cef84a83fe8b32344331020bcf01b42f28a106c5 /Documentation/devicetree/bindings/mtd | |
parent | 5ba8c27a6e5e7b6d63f3038fd92c066a3332f455 (diff) | |
parent | e488ca9f8d4f62c2dc36bfa5c32f68e7f05ab381 (diff) | |
download | linux-stable-2027cba66a0591e65a64d3ecfe8a3aa2f55a681b.tar.gz linux-stable-2027cba66a0591e65a64d3ecfe8a3aa2f55a681b.tar.bz2 linux-stable-2027cba66a0591e65a64d3ecfe8a3aa2f55a681b.zip |
mtd: merge for-4.4 development into -next development
A few MAINTAINERS updates, and some DT binding/documentation fixups.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'Documentation/devicetree/bindings/mtd')
-rw-r--r-- | Documentation/devicetree/bindings/mtd/partition.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mtd/partition.txt b/Documentation/devicetree/bindings/mtd/partition.txt index 8dc4bf9dc8e5..81a224da63be 100644 --- a/Documentation/devicetree/bindings/mtd/partition.txt +++ b/Documentation/devicetree/bindings/mtd/partition.txt @@ -6,7 +6,9 @@ used for what purposes, but which don't use an on-flash partition table such as RedBoot. The partition table should be a subnode of the mtd node and should be named -'partitions'. Partitions are defined in subnodes of the partitions node. +'partitions'. This node should have the following property: +- compatible : (required) must be "fixed-partitions" +Partitions are then defined in subnodes of the partitions node. For backwards compatibility partitions as direct subnodes of the mtd device are supported. This use is discouraged. @@ -38,6 +40,7 @@ Examples: flash@0 { partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; @@ -55,6 +58,7 @@ flash@0 { flash@1 { partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <2>; @@ -68,6 +72,7 @@ flash@1 { flash@2 { partitions { + compatible = "fixed-partitions"; #address-cells = <2>; #size-cells = <2>; |