diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 15:37:09 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 15:37:09 -0400 |
| commit | c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7 (patch) | |
| tree | fd013d6f38b25fd1c3890a7f4ad9aa25311e7f54 /Documentation/devicetree | |
| parent | 49121304a9831449a841ca0c77dc0ad8697e23c9 (diff) | |
| parent | 778435045a416da71f1757a80e37200a5ea5af70 (diff) | |
Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes
From Andrew Lunn <andrew@lunn.ch>:
* 'v3.5-rc7-fixes' of git://github.com/lunn/linux:
ARM: Kirkwood: Replace mrvl with marvell
ARM: Orion: fix driver probe error handling with respect to clk
ARM: Dove: Fixup ge00 initialisation
ARM: Kirkwood: Fix PHY disable clk problems
ARM: Kirkwood: Ensure runit clock always ticks.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree')
| -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 { |