git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20171120' of git://git.infradead.org/linux-mtd
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mtd
/
jedec,spi-nor.txt
diff --git
a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
index 9ce35af8507c1da0a208fc1823b5d1d487909114..376fa2f50e6bc9b41052928037acd4b3a382d380 100644
(file)
--- a/
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
+++ b/
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
@@
-13,6
+13,8
@@
Required properties:
at25df321a
at25df641
at26df081a
+ en25s64
+ mr25h128
mr25h256
mr25h10
mr25h40
@@
-31,6
+33,7
@@
Required properties:
s25fl008k
s25fl064k
sst25vf040b
+ sst25wf040b
m25p40
m25p80
m25p16