From patchwork Fri Dec 14 14:59:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongjin Kim X-Patchwork-Id: 1879011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 3C5F03FC64 for ; Fri, 14 Dec 2012 15:03:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TjWkJ-00012Q-11; Fri, 14 Dec 2012 15:00:15 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TjWkF-000128-Tm for linux-arm-kernel@lists.infradead.org; Fri, 14 Dec 2012 15:00:12 +0000 Received: by mail-pa0-f49.google.com with SMTP id bi1so2277104pad.36 for ; Fri, 14 Dec 2012 07:00:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=pOrGvn9W5iae6EGLQhcUMvSceL3uPXJVTk4p7AZgGk8=; b=M7LVNmGnnrHEPt7WmfFvtIfVH1lcXtSqAbfB+nnVp6QEhElg1vG6joY8mjwuj7ZUcX UQdIiFZHgXczQzf+76/ej8YBOTK4Pj9uhCnpoZq75A6WXVIBR8x6PyacXsYoQdzpSJiu otuo8vB/o83F9C8qhs5QOCcsmlJS/FtL0oRXnKCzbulUrNNS7BO1zXCwYWyrmbgXQIdG mhsvv6TnacjwrGMcsWPrMjCriEzuyUKtaIHwKT9VlwILIq01ioyTOLuadEYRj4jkmoDW PGSS85/QOw3syf/vWOM2/YpwdSK+WYrfWzCGRnhbr8jt8qb0KorG3mNikBRT/sr4jq5c 6DfA== Received: by 10.66.89.42 with SMTP id bl10mr16715491pab.2.1355497208998; Fri, 14 Dec 2012 07:00:08 -0800 (PST) Received: from localhost.localdomain ([125.177.223.206]) by mx.google.com with ESMTPS id kl5sm3052014pbc.74.2012.12.14.07.00.05 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 07:00:07 -0800 (PST) From: Dongjin Kim To: Subject: [PATCH] ARM: EXYNOS: Fix MSHC clocks instance names Date: Fri, 14 Dec 2012 23:59:44 +0900 Message-Id: <1355497184-26825-1-git-send-email-tobetter@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121214_100012_111216_35988A31 X-CRM114-Status: GOOD ( 11.64 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tobetter[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: linux-samsung-soc@vger.kernel.org, Russell King , linux-kernel@vger.kernel.org, Kukjin Kim , Dongjin Kim , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Replace clock instance name of MSHC controller for BIC and CIU of Exynos4412. Signed-off-by: Dongjin Kim --- arch/arm/mach-exynos/clock-exynos4.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c index efead60..ae83011 100644 --- a/arch/arm/mach-exynos/clock-exynos4.c +++ b/arch/arm/mach-exynos/clock-exynos4.c @@ -529,8 +529,8 @@ static struct clk exynos4_init_clocks_off[] = { .enable = exynos4_clk_ip_fsys_ctrl, .ctrlbit = (1 << 8), }, { - .name = "dwmmc", - .parent = &exynos4_clk_aclk_133.clk, + .name = "biu", + .parent = &exynos4_clk_aclk_200.clk, .enable = exynos4_clk_ip_fsys_ctrl, .ctrlbit = (1 << 9), }, { @@ -1132,15 +1132,7 @@ static struct clksrc_clk exynos4_clksrcs[] = { .sources = &exynos4_clkset_mout_mfc, .reg_src = { .reg = EXYNOS4_CLKSRC_MFC, .shift = 8, .size = 1 }, .reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0, .size = 4 }, - }, { - .clk = { - .name = "sclk_dwmmc", - .parent = &exynos4_clk_dout_mmc4.clk, - .enable = exynos4_clksrc_mask_fsys_ctrl, - .ctrlbit = (1 << 16), - }, - .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 }, - } + }, }; static struct clksrc_clk exynos4_clk_sclk_uart0 = { @@ -1235,6 +1227,16 @@ static struct clksrc_clk exynos4_clk_sclk_mmc3 = { .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS2, .shift = 24, .size = 8 }, }; +static struct clksrc_clk exynos4_clk_sclk_dwmci = { + .clk = { + .name = "ciu", + .parent = &exynos4_clk_dout_mmc4.clk, + .enable = exynos4_clksrc_mask_fsys_ctrl, + .ctrlbit = (1 << 16), + }, + .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 }, +}; + static struct clksrc_clk exynos4_clk_mdout_spi0 = { .clk = { .name = "mdout_spi", @@ -1348,6 +1350,7 @@ static struct clksrc_clk *exynos4_clksrc_cdev[] = { &exynos4_clk_sclk_mmc1, &exynos4_clk_sclk_mmc2, &exynos4_clk_sclk_mmc3, + &exynos4_clk_sclk_dwmci, &exynos4_clk_sclk_spi0, &exynos4_clk_sclk_spi1, &exynos4_clk_sclk_spi2,