From patchwork Thu Dec 1 05:50:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 5413 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 92A9623E1A for ; Thu, 1 Dec 2011 05:52:25 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 7123AA18337 for ; Thu, 1 Dec 2011 05:52:25 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id h2so787073laa.11 for ; Wed, 30 Nov 2011 21:52:25 -0800 (PST) Received: by 10.152.105.226 with SMTP id gp2mr3454196lab.28.1322718745346; Wed, 30 Nov 2011 21:52:25 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs48431lal; Wed, 30 Nov 2011 21:52:25 -0800 (PST) Received: by 10.50.158.227 with SMTP id wx3mr6249170igb.52.1322718742879; Wed, 30 Nov 2011 21:52:22 -0800 (PST) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id y15si1074249ibh.133.2011.11.30.21.52.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 30 Nov 2011 21:52:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) smtp.mail=tushar.behera@linaro.org Received: by mail-iy0-f178.google.com with SMTP id j38so2280980iad.37 for ; Wed, 30 Nov 2011 21:52:22 -0800 (PST) Received: by 10.42.244.133 with SMTP id lq5mr6906285icb.29.1322718742308; Wed, 30 Nov 2011 21:52:22 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id a2sm9221859igj.7.2011.11.30.21.52.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 30 Nov 2011 21:52:21 -0800 (PST) From: Tushar Behera To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, linaro-dev@lists.linaro.org, patches@linaro.org Subject: [PATCH 2/3] ARM: EXYNOS: Add clkdev lookup entry for lcd clock Date: Thu, 1 Dec 2011 11:20:10 +0530 Message-Id: <1322718611-20934-3-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1322718611-20934-1-git-send-email-tushar.behera@linaro.org> References: <1322718611-20934-1-git-send-email-tushar.behera@linaro.org> The framebuffer driver needs the clock named 'lcd' as its bus clock but the equivalent clock on Exynos4 is named as 'fimd'. Hence, create a clkdev lookup entry with the name 'lcd' that references the 'fimd' clock. Signed-off-by: Tushar Behera Reviewed-by: Sylwester Nawrocki Acked-by: Jingoo Han --- arch/arm/mach-exynos/clock.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c index 5d8d483..607ec28 100644 --- a/arch/arm/mach-exynos/clock.c +++ b/arch/arm/mach-exynos/clock.c @@ -489,11 +489,6 @@ static struct clk init_clocks_off[] = { .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 3), }, { - .name = "fimd", - .devname = "exynos4-fb.0", - .enable = exynos4_clk_ip_lcd0_ctrl, - .ctrlbit = (1 << 0), - }, { .name = "hsmmc", .devname = "s3c-sdhci.0", .parent = &clk_aclk_133.clk, @@ -782,6 +777,13 @@ static struct clk clk_pdma1 = { .ctrlbit = (1 << 1), }; +static struct clk clk_fimd0 = { + .name = "fimd", + .devname = "exynos4-fb.0", + .enable = exynos4_clk_ip_lcd0_ctrl, + .ctrlbit = (1 << 0), +}; + struct clk *clkset_group_list[] = { [0] = &clk_ext_xtal_mux, [1] = &clk_xusbxti, @@ -1294,6 +1296,7 @@ static struct clksrc_clk *sysclks[] = { static struct clk *clk_cdev[] = { &clk_pdma0, &clk_pdma1, + &clk_fimd0, }; static struct clksrc_clk *clksrc_cdev[] = { @@ -1318,6 +1321,7 @@ static struct clk_lookup exynos4_clk_lookup[] = { CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk), CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0), CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1), + CLKDEV_INIT("exynos4-fb.0", "lcd", &clk_fimd0), }; static int xtal_rate;