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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
memory-controllers
/
ingenic,jz4780-nemc.txt
diff --git
a/Documentation/devicetree/bindings/memory-controllers/ingenic,jz4780-nemc.txt
b/Documentation/devicetree/bindings/memory-controllers/ingenic,jz4780-nemc.txt
index f936b5589b1953030adc2563c88555398a49e839..59b8dcc118ee331206f30a02c9cea49e15c796b7 100644
(file)
--- a/
Documentation/devicetree/bindings/memory-controllers/ingenic,jz4780-nemc.txt
+++ b/
Documentation/devicetree/bindings/memory-controllers/ingenic,jz4780-nemc.txt
@@
-5,6
+5,7
@@
controller in Ingenic JZ4780
Required properties:
- compatible: Should be set to one of:
+ "ingenic,jz4740-nemc" (JZ4740)
"ingenic,jz4780-nemc" (JZ4780)
- reg: Should specify the NEMC controller registers location and length.
- clocks: Clock for the NEMC controller.