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 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mfd
/
atmel-matrix.txt
diff --git
a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt
b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt
index e3ef50ca02a5e4f1f81ff57c1e46ea78118e9528..89d05c64fb014de597d4fd3be0792e86edd075b6 100644
(file)
--- a/
Documentation/devicetree/bindings/mfd/atmel-matrix.txt
+++ b/
Documentation/devicetree/bindings/mfd/atmel-matrix.txt
@@
-13,6
+13,7
@@
Required properties:
"atmel,at91sam9n12-matrix", "syscon"
"atmel,at91sam9x5-matrix", "syscon"
"atmel,sama5d3-matrix", "syscon"
+ "microchip,sam9x60-matrix", "syscon"
- reg: Contains offset/length value of the Bus Matrix
memory region.