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

Conflicts:
	arch/arm/boot/dts/exynos5250-smdk5250.dts
	arch/arm/mach-exynos/mach-exynos5-dt.c

diff --cc arch/arm/boot/dts/exynos5250-smdk5250.dts
index 21d4ccdb0a5aa9a5067cc110588ebe98ba10d29e,7212d538086d088e507cf7a7dadf07815982f3f0..405009ce0cea6cb675bdae29a673976d5dcb5d6a
--- 1/arch/arm/boot/dts/exynos5250-smdk5250.dts
--- 2/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@@ -167,8 -185,7 +185,12 @@@
                status = "disabled";
        };
  
-       codec@11000000 {
++      codec {
 +              samsung,mfc-r = <0x43000000 0x800000>;
 +              samsung,mfc-l = <0x51000000 0x800000>;
 +      };
++
+       hdmi {
+               hpd-gpio = <&gpx3 7 0xf 1 3>;
+       };
  };

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc arch/arm/mach-exynos/clock-exynos5.c
index d4ae64eb66fa57f130840a69350f9b7f3ec3b090,a86f20fb05a1cfe874f55f4c05cf638eab97570d..a88e0d9c20f03a8ceca8cccb49f0ffa5cf86a7bb
--- 1/arch/arm/mach-exynos/clock-exynos5.c
--- 2/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@@ -674,19 -674,19 +679,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,

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
index 4c0f3369abdfa41b974fd7ac063c7db647d9a119,db035374087eeafd48f7ce71872b43ef417ce4da..ed372737268d30e42221458e594b3d39abfe2176
--- 1/arch/arm/mach-exynos/mach-exynos5-dt.c
--- 2/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@@ -75,9 -76,10 +79,13 @@@ static const struct of_dev_auxdata exyn
                                "exynos-gsc.2", NULL),
        OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3,
                                "exynos-gsc.3", NULL),
 +      OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
 +      OF_DEV_AUXDATA("samsung,exynos5250-tmu", 0x10060000,
 +                              "exynos-tmu", NULL),
+       OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000,
+                               "exynos5-hdmi", NULL),
+       OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
+                               "exynos5-mixer", NULL),
        {},
  };
  

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge