diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 08:56:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 08:56:43 +0200 |
| commit | 461f8cfc7ea788428240271818363333ceff5c4c (patch) | |
| tree | a3d6e3737c203ea29f8db2a6ddaadc326247376c /dts/Bindings/mtd | |
| parent | 6345d37ae50c3ac8dd0e6176bc846fe211cbddd4 (diff) | |
| download | barebox-461f8cfc7ea788428240271818363333ceff5c4c.tar.gz barebox-461f8cfc7ea788428240271818363333ceff5c4c.tar.xz | |
dts: update to v4.1-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/Bindings/mtd')
| -rw-r--r-- | dts/Bindings/mtd/m25p80.txt | 13 | ||||
| -rw-r--r-- | dts/Bindings/mtd/pxa3xx-nand.txt | 2 | ||||
| -rw-r--r-- | dts/Bindings/mtd/sunxi-nand.txt | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/dts/Bindings/mtd/m25p80.txt b/dts/Bindings/mtd/m25p80.txt index 4611aa8353..f20b111b50 100644 --- a/dts/Bindings/mtd/m25p80.txt +++ b/dts/Bindings/mtd/m25p80.txt @@ -3,10 +3,13 @@ Required properties: - #address-cells, #size-cells : Must be present if the device has sub-nodes representing partitions. -- compatible : Should be the manufacturer and the name of the chip. Bear in mind - the DT binding is not Linux-only, but in case of Linux, see the - "spi_nor_ids" table in drivers/mtd/spi-nor/spi-nor.c for the list - of supported chips. +- compatible : May include a device-specific string consisting of the + manufacturer and name of the chip. Bear in mind the DT binding + is not Linux-only, but in case of Linux, see the "m25p_ids" + table in drivers/mtd/devices/m25p80.c for the list of supported + chips. + Must also include "nor-jedec" for any SPI NOR flash that can be + identified by the JEDEC READ ID opcode (0x9F). - reg : Chip-Select number - spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at @@ -22,7 +25,7 @@ Example: flash: m25p80@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,m25p80"; + compatible = "spansion,m25p80", "nor-jedec"; reg = <0>; spi-max-frequency = <40000000>; m25p,fast-read; diff --git a/dts/Bindings/mtd/pxa3xx-nand.txt b/dts/Bindings/mtd/pxa3xx-nand.txt index de8b517a55..4f833e3c4f 100644 --- a/dts/Bindings/mtd/pxa3xx-nand.txt +++ b/dts/Bindings/mtd/pxa3xx-nand.txt @@ -14,7 +14,7 @@ Optional properties: - marvell,nand-enable-arbiter: Set to enable the bus arbiter - marvell,nand-keep-config: Set to keep the NAND controller config as set by the bootloader - - num-cs: Number of chipselect lines to usw + - num-cs: Number of chipselect lines to use - nand-on-flash-bbt: boolean to enable on flash bbt option if not present false - nand-ecc-strength: number of bits to correct per ECC step diff --git a/dts/Bindings/mtd/sunxi-nand.txt b/dts/Bindings/mtd/sunxi-nand.txt index 0273adb863..086d6f44c4 100644 --- a/dts/Bindings/mtd/sunxi-nand.txt +++ b/dts/Bindings/mtd/sunxi-nand.txt @@ -21,7 +21,7 @@ Optional properties: - nand-ecc-mode : one of the supported ECC modes ("hw", "hw_syndrome", "soft", "soft_bch" or "none") -see Documentation/devicetree/mtd/nand.txt for generic bindings. +see Documentation/devicetree/bindings/mtd/nand.txt for generic bindings. Examples: |