Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e152c38a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

+2 −2
Original line number Diff line number Diff line
@@ -4,5 +4,5 @@ Required properties: 
- compatible : must be "arm,versatile-flash";

- bank-width : width in bytes of flash interface.



Optional properties:

- Subnode partition map from mtd flash binding
 
The device tree may optionally contain sub-nodes describing partitions of the

address space. See partition.txt for more detail.

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

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
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 {

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

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 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 {

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

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 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 {

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

+2 −21
Original line number Diff line number Diff line
@@ -23,27 +23,8 @@ are defined: 
 - vendor-id : Contains the flash chip's vendor 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

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.

The device tree may optionally contain sub-nodes describing partitions of the

address space. See partition.txt for more detail.



Example: