diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt b/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt index a48b2cadc7f0..00f1f546b32e 100644 --- a/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt +++ b/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt | |||
| @@ -15,7 +15,7 @@ Optional properties: | |||
| 15 | - gpios : may specify optional GPIOs connected to the Ready-Not-Busy pins | 15 | - gpios : may specify optional GPIOs connected to the Ready-Not-Busy pins |
| 16 | (R/B#). For multi-chip devices, "n" GPIO definitions are required | 16 | (R/B#). For multi-chip devices, "n" GPIO definitions are required |
| 17 | according to the number of chips. | 17 | according to the number of chips. |
| 18 | - chip-delay : chip dependent delay for transfering data from array to | 18 | - chip-delay : chip dependent delay for transferring data from array to |
| 19 | read registers (tR). Required if property "gpios" is not used | 19 | read registers (tR). Required if property "gpios" is not used |
| 20 | (R/B# pins not connected). | 20 | (R/B# pins not connected). |
| 21 | 21 | ||