diff options
| author | Choi jonghwan <jhbird.choi@samsung.com> | 2010-10-22 04:17:02 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-17 17:51:59 -0800 |
| commit | c81905e0941064b0fd01154c5441eeece935ae43 (patch) | |
| tree | f66a2a6306ce5d0688fe3f056f4f5989b08375a4 /arch | |
| parent | 628dabdc62177ef9b6b7358ccf2e861bec0ead2b (diff) | |
| download | kernel_samsung_crespo-c81905e0941064b0fd01154c5441eeece935ae43.zip kernel_samsung_crespo-c81905e0941064b0fd01154c5441eeece935ae43.tar.gz kernel_samsung_crespo-c81905e0941064b0fd01154c5441eeece935ae43.tar.bz2 | |
S5PC11X: FIMD: Fimd use sclk_fimd clock.
FIMD use sclk_fimd clock. lcd clock isn't needed.
Change-Id: I8b33d5996a5c3232a0b00e975b25540708014772
Signed-off-by: Choi jonghwan <jhbird.choi@samsung.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s5pv210/clock.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/setup-fb.c | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index 682cd85..b8e399e 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c @@ -1171,8 +1171,8 @@ static struct clksrc_clk clksrcs[] = { .clk = { .name = "sclk_fimd", .id = -1, - .enable = s5pv210_clk_mask0_ctrl, - .ctrlbit = (1 << 5), + .enable = s5pv210_clk_ip1_ctrl, + .ctrlbit = (1 << 0), }, .sources = &clkset_group2, .reg_src = { .reg = S5P_CLK_SRC1, .shift = 20, .size = 4 }, diff --git a/arch/arm/mach-s5pv210/setup-fb.c b/arch/arm/mach-s5pv210/setup-fb.c index 123fb2d..85adf23 100644 --- a/arch/arm/mach-s5pv210/setup-fb.c +++ b/arch/arm/mach-s5pv210/setup-fb.c @@ -65,7 +65,6 @@ int s3cfb_clk_on(struct platform_device *pdev, struct clk **s3cfb_clk) { struct clk *sclk = NULL; struct clk *mout_mpll = NULL; - struct clk *lcd = NULL; u32 rate = 0; sclk = clk_get(&pdev->dev, "sclk_fimd"); @@ -77,7 +76,7 @@ int s3cfb_clk_on(struct platform_device *pdev, struct clk **s3cfb_clk) mout_mpll = clk_get(&pdev->dev, "mout_mpll"); if (IS_ERR(mout_mpll)) { dev_err(&pdev->dev, "failed to get mout_mpll\n"); - goto err_clk1; + goto err_clk2; } clk_set_parent(sclk, mout_mpll); @@ -92,24 +91,14 @@ int s3cfb_clk_on(struct platform_device *pdev, struct clk **s3cfb_clk) clk_enable(sclk); - lcd = clk_get(&pdev->dev, "lcd"); - if (IS_ERR(lcd)) { - dev_err(&pdev->dev, "failed to get IP clock for fimd\n"); - goto err_clk2; - } - - clk_enable(lcd); - *s3cfb_clk = sclk; return 0; err_clk2: - clk_put(mout_mpll); - -err_clk1: clk_put(sclk); +err_clk1: return -EINVAL; } |