From: Kukjin Kim <kgene.kim@samsung.com>
Date: Mon, 29 Oct 2012 13:03:33 +0000 (+0900)
Subject: Merge branch 'next/hdmi-samsung' into for-next
X-Git-Tag: next-20121030~11^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c11068538994430547722dc9fb515a0ceefd5cb9;p=karo-tx-linux.git

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

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

c11068538994430547722dc9fb515a0ceefd5cb9
diff --cc arch/arm/boot/dts/exynos5250-smdk5250.dts
index 21d4ccdb0a5a,7212d538086d..405009ce0cea
--- a/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/mach-exynos/clock-exynos5.c
index d4ae64eb66fa,a86f20fb05a1..a88e0d9c20f0
--- a/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 4c0f3369abdf,db035374087e..ed372737268d
--- a/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),
  	{},
  };