diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 10:45:25 -0400 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 10:45:25 -0400 |
| commit | 89fb2d77d5daa821e3868ea59963f28249974840 (patch) | |
| tree | 6cc80209a208133000c203cf9a9f61dd42fd53a9 /Documentation | |
| parent | 4297103560b4c5aba904e4711e982a039619f1f6 (diff) | |
| parent | 778435045a416da71f1757a80e37200a5ea5af70 (diff) | |
Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3
Merge in branch already pulled. Fulfils dependancies needed by
this patchset.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/orion-nand.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mtd/orion-nand.txt b/Documentation/devicetree/bindings/mtd/orion-nand.txt index b2356b7d2fa4..2d6ab660e603 100644 --- a/Documentation/devicetree/bindings/mtd/orion-nand.txt +++ b/Documentation/devicetree/bindings/mtd/orion-nand.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | NAND support for Marvell Orion SoC platforms | 1 | NAND support for Marvell Orion SoC platforms |
| 2 | 2 | ||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - compatible : "mrvl,orion-nand". | 4 | - compatible : "marvell,orion-nand". |
| 5 | - reg : Base physical address of the NAND and length of memory mapped | 5 | - reg : Base physical address of the NAND and length of memory mapped |
| 6 | region | 6 | region |
| 7 | 7 | ||
| @@ -24,7 +24,7 @@ nand@f4000000 { | |||
| 24 | ale = <1>; | 24 | ale = <1>; |
| 25 | bank-width = <1>; | 25 | bank-width = <1>; |
| 26 | chip-delay = <25>; | 26 | chip-delay = <25>; |
| 27 | compatible = "mrvl,orion-nand"; | 27 | compatible = "marvell,orion-nand"; |
| 28 | reg = <0xf4000000 0x400>; | 28 | reg = <0xf4000000 0x400>; |
| 29 | 29 | ||
| 30 | partition@0 { | 30 | partition@0 { |