From: Kukjin Kim <kgene.kim@samsung.com>
Date: Tue, 20 Nov 2012 09:19:10 +0000 (+0900)
Subject: Merge branch 'next/hdmi-samsung' into next/devel-samsung
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=840ed42942cc1ebbda2ed55f4019673b537fc5de;p=linux-beck.git

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

840ed42942cc1ebbda2ed55f4019673b537fc5de
diff --cc arch/arm/mach-exynos/clock-exynos5.c
index e5c59fae225c,a86f20fb05a1..de9ae1351e77
--- a/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,