diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:38:59 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:39:08 +0200 |
commit | 4672b1d65fc9b5a5ded911fbebb4853b892d5d89 (patch) | |
tree | 4ddeeb9fd195ce85f0f49525b94c39bdee8b94d9 /Documentation/devicetree/bindings/mtd/qcom_nandc.txt | |
parent | drm/stm: ltdc: restore calls to clk_{enable/disable} (diff) | |
parent | Merge tag 'drm-intel-next-2019-05-24' of git://anongit.freedesktop.org/drm/dr... (diff) | |
download | linux-4672b1d65fc9b5a5ded911fbebb4853b892d5d89.tar.xz linux-4672b1d65fc9b5a5ded911fbebb4853b892d5d89.zip |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
This picks up rc2 for us as well.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'Documentation/devicetree/bindings/mtd/qcom_nandc.txt')
-rw-r--r-- | Documentation/devicetree/bindings/mtd/qcom_nandc.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt index 1123cc6d56ef..5c2fba4b30fe 100644 --- a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt +++ b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt @@ -47,8 +47,8 @@ Required properties: - #size-cells: see partition.txt Optional properties: -- nand-bus-width: see nand.txt -- nand-ecc-strength: see nand.txt. If not specified, then ECC strength will +- nand-bus-width: see nand-controller.yaml +- nand-ecc-strength: see nand-controller.yaml. If not specified, then ECC strength will be used according to chip requirement and available OOB size. |