Commit e152c38a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull devicetree documentation update from Grant Likely.

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  dt: Linux DT usage model documentation
  mtd: Move fdt partition documentation to a seperate file
parents eb05df9e 31134efc
...@@ -4,5 +4,5 @@ Required properties: ...@@ -4,5 +4,5 @@ Required properties:
- compatible : must be "arm,versatile-flash"; - compatible : must be "arm,versatile-flash";
- bank-width : width in bytes of flash interface. - bank-width : width in bytes of flash interface.
Optional properties: The device tree may optionally contain sub-nodes describing partitions of the
- Subnode partition map from mtd flash binding address space. See partition.txt for more detail.
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
Required properties: Required properties:
- compatible : "atmel,<model>", "atmel,<series>", "atmel,dataflash". - 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: Example:
flash@1 { flash@1 {
......
...@@ -19,6 +19,10 @@ Optional properties: ...@@ -19,6 +19,10 @@ Optional properties:
read registers (tR). Required if property "gpios" is not used read registers (tR). Required if property "gpios" is not used
(R/B# pins not connected). (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: Examples:
upm@1,0 { upm@1,0 {
......
...@@ -25,6 +25,9 @@ Optional properties: ...@@ -25,6 +25,9 @@ Optional properties:
GPIO state and before and after command byte writes, this register will be GPIO state and before and after command byte writes, this register will be
read to ensure that the GPIO accesses have completed. 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: Examples:
gpio-nand@1,0 { gpio-nand@1,0 {
......
...@@ -23,27 +23,8 @@ are defined: ...@@ -23,27 +23,8 @@ are defined:
- vendor-id : Contains the flash chip's vendor id (1 byte). - vendor-id : Contains the flash chip's vendor id (1 byte).
- device-id : Contains the flash chip's device 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 The device tree may optionally contain sub-nodes describing partitions of the
device tree may optionally contain additional information address space. See partition.txt for more detail.
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: Example:
......
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@0 {
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};
uimage@100000 {
reg = <0x0100000 0x200000>;
};
];
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment