summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2017-01-05 09:33:26 -0800
committerBrian Norris <computersforpeace@gmail.com>2017-01-05 09:33:26 -0800
commit5bdee5496978c6738dd90869b54c0f30c0344ccf (patch)
tree6947c5c993ae85c8ee15a77e04cb7efe6bc29597 /Documentation
parent0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff)
parentcf9e1672a66c49ed8903c01b4c380a2f2dc91b40 (diff)
downloadlinux-stable-5bdee5496978c6738dd90869b54c0f30c0344ccf.tar.gz
linux-stable-5bdee5496978c6738dd90869b54c0f30c0344ccf.tar.bz2
linux-stable-5bdee5496978c6738dd90869b54c0f30c0344ccf.zip
Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux
From Boris Brezillon: """ Fixes for 4.10-rc3 - Forbid compiling xway NAND controller driver as a module - Fix tango NAND DT binding and make sure the controller is in a clean state at probe time - Add dependency on HAS_IOMEM to the oxnas NAND driver - Fix irq number validity check in the lpc32xx driver """
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/mtd/tango-nand.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/mtd/tango-nand.txt b/Documentation/devicetree/bindings/mtd/tango-nand.txt
index ad5a02f2ac8c..cd1bf2ac9055 100644
--- a/Documentation/devicetree/bindings/mtd/tango-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/tango-nand.txt
@@ -5,7 +5,7 @@ Required properties:
- compatible: "sigma,smp8758-nand"
- reg: address/size of nfc_reg, nfc_mem, and pbus_reg
- dmas: reference to the DMA channel used by the controller
-- dma-names: "nfc_sbox"
+- dma-names: "rxtx"
- clocks: reference to the system clock
- #address-cells: <1>
- #size-cells: <0>
@@ -17,9 +17,9 @@ Example:
nandc: nand-controller@2c000 {
compatible = "sigma,smp8758-nand";
- reg = <0x2c000 0x30 0x2d000 0x800 0x20000 0x1000>;
+ reg = <0x2c000 0x30>, <0x2d000 0x800>, <0x20000 0x1000>;
dmas = <&dma0 3>;
- dma-names = "nfc_sbox";
+ dma-names = "rxtx";
clocks = <&clkgen SYS_CLK>;
#address-cells = <1>;
#size-cells = <0>;