From: Kukjin Kim <kgene.kim@samsung.com>
Date: Mon, 28 Jul 2014 21:09:42 +0000 (+0900)
Subject: Merge branch 'v3.17-next/power-exynos' into v3.17-next/dt-samsung-2
X-Git-Tag: v3.17-rc1~77^2^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6da287ad0266cca1fa8f88fb8b1c466e8164671f;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'v3.17-next/power-exynos' into v3.17-next/dt-samsung-2
---

6da287ad0266cca1fa8f88fb8b1c466e8164671f
diff --cc arch/arm/boot/dts/exynos5420.dtsi
index 3d528cf,1595722..b69de26
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@@ -260,8 -260,16 +260,11 @@@
  	mfc_pd: power-domain@10044060 {
  		compatible = "samsung,exynos4210-pd";
  		reg = <0x10044060 0x20>;
+ 		clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MOUT_SW_ACLK333>,
+ 			<&clock CLK_MOUT_USER_ACLK333>;
+ 		clock-names = "oscclk", "pclk0", "clk0";
  	};
  
 -	disp_pd: power-domain@100440C0 {
 -		compatible = "samsung,exynos4210-pd";
 -		reg = <0x100440C0 0x20>;
 -	};
 -
  	msc_pd: power-domain@10044120 {
  		compatible = "samsung,exynos4210-pd";
  		reg = <0x10044120 0x20>;