projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
Documentation
/
devicetree
/
bindings
/
media
/
cedrus.txt
diff --git
a/Documentation/devicetree/bindings/media/cedrus.txt
b/Documentation/devicetree/bindings/media/cedrus.txt
index b3c0635dcd0e22baef91586fd7fe88223c84d10a..bce0705df953ff7b6c642599dfa087511f284d95 100644
(file)
--- a/
Documentation/devicetree/bindings/media/cedrus.txt
+++ b/
Documentation/devicetree/bindings/media/cedrus.txt
@@
-33,7
+33,7
@@
reserved-memory {
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
- cma_pool:
cma@4a000000
{
+ cma_pool:
default-pool
{
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;