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 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
dma
/
brcm,bcm2835-dma.txt
diff --git
a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
index baf9b34d20bfb5b5493e0a69841362530c900a77..b6a8cc0978cd5ff91965b7b3cf93813b80972a3e 100644
(file)
--- a/
Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
+++ b/
Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
@@
-74,8
+74,8
@@
Example:
bcm2835_i2s: i2s@7e203000 {
compatible = "brcm,bcm2835-i2s";
- reg = < 0x7e203000 0x2
0>,
-
< 0x7e101098 0x02
>;
+ reg = < 0x7e203000 0x2
4>;
+
clocks = <&clocks BCM2835_CLOCK_PCM
>;
dmas = <&dma 2>,
<&dma 3>;