Merge tag 'iwlwifi-for-john-2014-11-10' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / include / dt-bindings / clock / exynos4.h

diff --git a/include/dt-bindings/clock/exynos4.h b/include/dt-bindings/clock/exynos4.h
index 459bd2bd411fbe1387b7949ad218f5df6b845a01..34fe28c622d0a6c2cbfbef348be34dfefa2b59f9 100644 (file)
--- a/include/dt-bindings/clock/exynos4.h
+++ b/include/dt-bindings/clock/exynos4.h
@@ -115,11 +115,11 @@
 #define CLK_SMMU_MFCR          275
 #define CLK_G3D                        276
 #define CLK_G2D                        277
-#define CLK_ROTATOR            278 /* Exynos4210 only */
-#define CLK_MDMA               279 /* Exynos4210 only */
-#define CLK_SMMU_G2D           280 /* Exynos4210 only */
-#define CLK_SMMU_ROTATOR       281 /* Exynos4210 only */
-#define CLK_SMMU_MDMA          282 /* Exynos4210 only */
+#define CLK_ROTATOR            278
+#define CLK_MDMA               279
+#define CLK_SMMU_G2D           280
+#define CLK_SMMU_ROTATOR       281
+#define CLK_SMMU_MDMA          282
 #define CLK_FIMD0              283
 #define CLK_MIE0               284
 #define CLK_MDNIE0             285 /* Exynos4412 only */
@@ -234,6 +234,8 @@
 #define CLK_MOUT_G3D1          393
 #define CLK_MOUT_G3D           394
 #define CLK_ACLK400_MCUISP     395 /* Exynos4x12 only */
+#define CLK_MOUT_HDMI          396
+#define CLK_MOUT_MIXER         397
 
 /* gate clocks - ppmu */
 #define CLK_PPMULEFT           400