summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2013-12-30 18:15:23 +0100
committerTomasz Figa <t.figa@samsung.com>2013-12-30 18:15:23 +0100
commit2bb00c68e094271b79deac993893461cc051b721 (patch)
treedbd8676396eac15cc294da946d93fa671aab34bc /Documentation/devicetree
parentea72dc2cf9552631e43327ce593bdbb0b9fdf058 (diff)
parent3fd68c99f3026f4fe3a1b7b6fb75e5638b2032fd (diff)
downloadop-kernel-dev-2bb00c68e094271b79deac993893461cc051b721.zip
op-kernel-dev-2bb00c68e094271b79deac993893461cc051b721.tar.gz
Merge branch 'samsung-fixes' into samsung-next-base
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r--Documentation/devicetree/bindings/clock/exynos5250-clock.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt
index 24765c1..5883ec8 100644
--- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt
+++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt
@@ -159,6 +159,8 @@ clock which they consume.
mixer 343
hdmi 344
g2d 345
+ mdma0 346
+ smmu_mdma0 347
[Clock Muxes]
OpenPOWER on IntegriCloud