summaryrefslogtreecommitdiffstats
path: root/dts/Bindings
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-06-17 13:52:37 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-06-17 13:52:37 +0200
commit8ed978b79062787b9e911cf6d5ff4aebce484660 (patch)
tree4af532a17dd9c4e8f50bfc319cba7aaa272afb9f /dts/Bindings
parenta3a17dfd5a2c5df9626c844dcbef3bb2e9cce14c (diff)
downloadbarebox-8ed978b79062787b9e911cf6d5ff4aebce484660.tar.gz
barebox-8ed978b79062787b9e911cf6d5ff4aebce484660.tar.xz
dts: update to v4.1-rc4
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/Bindings')
-rw-r--r--dts/Bindings/mtd/jedec,spi-nor.txt (renamed from dts/Bindings/mtd/m25p80.txt)6
1 files changed, 3 insertions, 3 deletions
diff --git a/dts/Bindings/mtd/m25p80.txt b/dts/Bindings/mtd/jedec,spi-nor.txt
index f20b111b5..2bee68103 100644
--- a/dts/Bindings/mtd/m25p80.txt
+++ b/dts/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;