diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-01-05 18:33:26 +0100 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-01-05 18:33:26 +0100 |
| commit | 5bdee5496978c6738dd90869b54c0f30c0344ccf (patch) | |
| tree | 6947c5c993ae85c8ee15a77e04cb7efe6bc29597 /Documentation | |
| parent | Linux 4.10-rc2 (diff) | |
| parent | mtd: nand: lpc32xx: fix invalid error handling of a requested irq (diff) | |
| download | linux-5bdee5496978c6738dd90869b54c0f30c0344ccf.tar.xz linux-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.txt | 6 |
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>; |