Merge branch 'next/hdmi-samsung' into next/devel-samsung

diff --cc arch/arm/mach-exynos/clock-exynos5.c
index e5c59fae225c70b5bd160141b35adde5976be5d7,a86f20fb05a1cfe874f55f4c05cf638eab97570d..de9ae1351e77239a2f46884af0bdad2604026622
--- 1/arch/arm/mach-exynos/clock-exynos5.c
--- 2/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@@ -669,19 -674,19 +674,24 @@@ static struct clk exynos5_init_clocks_o
                .ctrlbit        = (1 << 0),
        }, {
                .name           = "hdmi",
-               .devname        = "exynos4-hdmi",
+               .devname        = "exynos5-hdmi",
                .enable         = exynos5_clk_ip_disp1_ctrl,
                .ctrlbit        = (1 << 6),
+       }, {
+               .name           = "hdmiphy",
+               .devname        = "exynos5-hdmi",
+               .enable         = exynos5_clk_hdmiphy_ctrl,
+               .ctrlbit        = (1 << 0),
        }, {
                .name           = "mixer",
-               .devname        = "s5p-mixer",
+               .devname        = "exynos5-mixer",
                .enable         = exynos5_clk_ip_disp1_ctrl,
                .ctrlbit        = (1 << 5),
 +      }, {
 +              .name           = "dp",
 +              .devname        = "exynos-dp",
 +              .enable         = exynos5_clk_ip_disp1_ctrl,
 +              .ctrlbit        = (1 << 4),
        }, {
                .name           = "jpeg",
                .enable         = exynos5_clk_ip_gen_ctrl,