diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-05-31 10:49:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-31 10:49:43 -0700 |
| commit | b4b12b0d2f02613101a7a667ef7b7cc8d388e597 (patch) | |
| tree | ae2d52198929797821961fd0b5923b5ea1a89fe1 /Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt | |
| parent | netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-b4b12b0d2f02613101a7a667ef7b7cc8d388e597.tar.xz linux-dev-b4b12b0d2f02613101a7a667ef7b7cc8d388e597.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The phylink conflict was between a bug fix by Russell King
to make sure we have a consistent PHY interface mode, and
a change in net-next to pull some code in phylink_resolve()
into the helper functions phylink_mac_link_{up,down}()
On the dp83867 side it's mostly overlapping changes, with
the 'net' side removing a condition that was supposed to
trigger for RGMII but because of how it was coded never
actually could trigger.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt b/Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt index ad2bef826582..e55895e8dae4 100644 --- a/Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt +++ b/Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt @@ -24,9 +24,9 @@ Required properties: - reg: describes the CS lines assigned to the NAND device. Optional properties: -- nand-on-flash-bbt: see nand.txt -- nand-ecc-strength: see nand.txt -- nand-ecc-step-size: see nand.txt +- nand-on-flash-bbt: see nand-controller.yaml +- nand-ecc-strength: see nand-controller.yaml +- nand-ecc-step-size: see nand-controller.yaml The following ECC strength and step size are currently supported: - nand-ecc-strength = <1>, nand-ecc-step-size = <512> (Hamming) |