Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / Documentation / devicetree / bindings / media / exynos4-fimc-is.txt

diff --git a/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt b/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt
index 55c9ad6..32ced99 100644 (file)
--- a/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt
+++ b/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt
@@ -16,9 +16,10 @@ Required properties:
 - clocks       : list of clock specifiers, corresponding to entries in
                  clock-names property;
 - clock-names  : must contain "ppmuispx", "ppmuispx", "lite0", "lite1"
-                 "mpll", "sysreg", "isp", "drc", "fd", "mcuisp", "uart",
-                 "ispdiv0", "ispdiv1", "mcuispdiv0", "mcuispdiv1", "aclk200",
-                 "div_aclk200", "aclk400mcuisp", "div_aclk400mcuisp" entries,
+                 "mpll", "sysreg", "isp", "drc", "fd", "mcuisp", "gicisp",
+                 "pwm_isp", "mcuctl_isp", "uart", "ispdiv0", "ispdiv1",
+                 "mcuispdiv0", "mcuispdiv1", "aclk200", "div_aclk200",
+                 "aclk400mcuisp", "div_aclk400mcuisp" entries,
                  matching entries in the clocks property.
 pmu subnode
 -----------