diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 14:17:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 14:17:15 -0700 |
| commit | 4cae85bed43d890f840019e2d21e39f96430802a (patch) | |
| tree | f880ab3768cd84e8f72923bef8fb235567fff20f /Documentation | |
| parent | c61b49c79e1c1d4bc0c2fdc053ef56e65759b5fd (diff) | |
| parent | 507e617440d70bc4269daac1b0ee96671bf2761a (diff) | |
| download | linux-4cae85bed43d890f840019e2d21e39f96430802a.tar.bz2 | |
Merge tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"We've already noticed a few flaws in the MTD work for v4.7-rc1:
- The Atmel folks got ahead of themselves on trying to support their
latest hardware and were working off incorrect documentation. Fix
up the NAND driver to get this correct.
- Fix up device tree example documentation to use the latest
recommendations for describing NAND ECC algorithms"
* tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd:
Documentation: dt: mtd: drop "soft_bch" from example
Revert "mtd: atmel_nand: Support variable RB_EDGE interrupts"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/atmel-nand.txt | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/nand.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/Documentation/devicetree/bindings/mtd/atmel-nand.txt index d53aba98fbc9..3e7ee99d3949 100644 --- a/Documentation/devicetree/bindings/mtd/atmel-nand.txt +++ b/Documentation/devicetree/bindings/mtd/atmel-nand.txt @@ -39,7 +39,7 @@ Optional properties: Nand Flash Controller(NFC) is an optional sub-node Required properties: -- compatible : "atmel,sama5d3-nfc" or "atmel,sama5d4-nfc". +- compatible : "atmel,sama5d3-nfc". - reg : should specify the address and size used for NFC command registers, NFC registers and NFC SRAM. NFC SRAM address and size can be absent if don't want to use it. diff --git a/Documentation/devicetree/bindings/mtd/nand.txt b/Documentation/devicetree/bindings/mtd/nand.txt index 68342eac2383..3733300de8dd 100644 --- a/Documentation/devicetree/bindings/mtd/nand.txt +++ b/Documentation/devicetree/bindings/mtd/nand.txt @@ -53,7 +53,8 @@ Example: nand@0 { reg = <0>; - nand-ecc-mode = "soft_bch"; + nand-ecc-mode = "soft"; + nand-ecc-algo = "bch"; /* controller specific properties */ }; |