diff options
author | 2015-05-18 10:50:43 -0700 | |
---|---|---|
committer | 2015-05-18 10:50:43 -0700 | |
commit | 2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49 (patch) | |
tree | 10924a4ec59c9b2d114c2287bd35e6debc72595f /Documentation/devicetree/bindings/mtd | |
parent | MAINTAINERS: add entry for new brcmnand/ directory (diff) | |
parent | Linux 4.1-rc4 (diff) | |
download | linux-2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49.tar.gz linux-2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49.tar.bz2 linux-2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49.zip |
Merge tag 'v4.1-rc4' into MTD's -next
Diffstat (limited to 'Documentation/devicetree/bindings/mtd')
-rw-r--r-- | Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt (renamed from Documentation/devicetree/bindings/mtd/m25p80.txt) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/mtd/m25p80.txt b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt index f20b111b502a..2bee68103b01 100644 --- a/Documentation/devicetree/bindings/mtd/m25p80.txt +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt @@ -8,8 +8,8 @@ Required properties: 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). + Must also include "jedec,spi-nor" 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 @@ -25,7 +25,7 @@ Example: flash: m25p80@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,m25p80", "nor-jedec"; + compatible = "spansion,m25p80", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <40000000>; m25p,fast-read; |