From: Olof Johansson <olof@lixom.net>
Date: Mon, 1 Oct 2012 21:37:01 +0000 (-0700)
Subject: Merge branch 'next/dt2' into HEAD
X-Git-Tag: v3.7-rc1~154^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7b27fa258c8f2670a8c09bbc6c4b2c874d155da2;p=~emulex%2Finfiniband.git

Merge branch 'next/dt2' into HEAD

Conflicts:
	arch/arm/mach-exynos/clock-exynos5.c
---

7b27fa258c8f2670a8c09bbc6c4b2c874d155da2
diff --cc arch/arm/mach-exynos/clock-exynos5.c
index f3171c3f3d9,17e6c77231f..c44ca1ee1b8
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@@ -1200,28 -1115,18 +1195,20 @@@ static struct clksrc_clk exynos5_clk_sc
  	.reg_div = { .reg = EXYNOS5_CLKDIV_PERIC2, .shift = 8, .size = 8 },
  };
  
 +struct clksrc_clk exynos5_clk_sclk_fimd1 = {
 +	.clk	= {
 +		.name		= "sclk_fimd",
 +		.devname	= "exynos5-fb.1",
 +		.enable		= exynos5_clksrc_mask_disp1_0_ctrl,
 +		.ctrlbit	= (1 << 0),
 +	},
 +	.sources = &exynos5_clkset_group,
 +	.reg_src = { .reg = EXYNOS5_CLKSRC_DISP1_0, .shift = 0, .size = 4 },
 +	.reg_div = { .reg = EXYNOS5_CLKDIV_DISP1_0, .shift = 0, .size = 4 },
 +};
 +
  static struct clksrc_clk exynos5_clksrcs[] = {
  	{
--		.clk	= {
- 			.name		= "sclk_dwmci",
- 			.parent		= &exynos5_clk_dout_mmc4.clk,
- 			.enable		= exynos5_clksrc_mask_fsys_ctrl,
- 			.ctrlbit	= (1 << 16),
 -			.name		= "sclk_fimd",
 -			.devname	= "s3cfb.1",
 -			.enable		= exynos5_clksrc_mask_disp1_0_ctrl,
 -			.ctrlbit	= (1 << 0),
--		},
- 		.reg_div = { .reg = EXYNOS5_CLKDIV_FSYS3, .shift = 8, .size = 8 },
 -		.sources = &exynos5_clkset_group,
 -		.reg_src = { .reg = EXYNOS5_CLKSRC_DISP1_0, .shift = 0, .size = 4 },
 -		.reg_div = { .reg = EXYNOS5_CLKDIV_DISP1_0, .shift = 0, .size = 4 },
--	}, {
  		.clk	= {
  			.name		= "aclk_266_gscl",
  		},