Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / include / dt-bindings / clock / exynos5433.h

diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindings/clock/exynos5433.h
index 5bd80d5..8e024fe 100644 (file)
--- a/include/dt-bindings/clock/exynos5433.h
+++ b/include/dt-bindings/clock/exynos5433.h
@@ -765,7 +765,12 @@
 #define CLK_SCLK_RGB_VCLK                              109
 #define CLK_SCLK_RGB_TV_VCLK                           110
 
-#define DISP_NR_CLK                                    111
+#define CLK_PHYCLK_HDMIPHY_PIXEL_CLKO_PHY              111
+#define CLK_PHYCLK_HDMIPHY_TMDS_CLKO_PHY               112
+
+#define CLK_PCLK_DECON                                 113
+
+#define DISP_NR_CLK                                    114
 
 /* CMU_AUD */
 #define CLK_MOUT_AUD_PLL_USER                          1
@@ -1298,7 +1303,7 @@
 #define CLK_MOUT_ACLK_LITE_C_B                         13
 #define CLK_MOUT_ACLK_LITE_C_A                         14
 
-#define CLK_DIV_SCLK_ISP_WPWM                          15
+#define CLK_DIV_SCLK_ISP_MPWM                          15
 #define CLK_DIV_PCLK_CAM1_83                           16
 #define CLK_DIV_PCLK_CAM1_166                          17
 #define CLK_DIV_PCLK_DBG_CAM1                          18