projects
/
linux-block.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
[linux-block.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 4cab5d85cf6f8eaf11cdf5b90b18cdcc3def4626..376fa2f50e6bc9b41052928037acd4b3a382d380 100644
(file)
--- a/
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
+++ b/
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
@@
-14,6
+14,7
@@
Required properties:
at25df641
at26df081a
en25s64
+ mr25h128
mr25h256
mr25h10
mr25h40