From patchwork Wed Jul 30 07:55:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 4646231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2A9659F36A for ; Wed, 30 Jul 2014 08:02:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDEAA20127 for ; Wed, 30 Jul 2014 08:02:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 29A2620123 for ; Wed, 30 Jul 2014 08:02:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCOn2-0008I4-TY; Wed, 30 Jul 2014 07:59:12 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCOmz-0008Fa-5f for linux-arm-kernel@lists.infradead.org; Wed, 30 Jul 2014 07:59:10 +0000 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9I007AZM5WCO40@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 30 Jul 2014 16:58:44 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 04.1A.14752.0B5A8D35; Wed, 30 Jul 2014 16:58:40 +0900 (KST) X-AuditID: cbfee68f-b7fa26d0000039a0-4e-53d8a5b03c18 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 0E.70.05196.0B5A8D35; Wed, 30 Jul 2014 16:58:40 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N9I000LDM5MS6C0@mmp2.samsung.com>; Wed, 30 Jul 2014 16:58:40 +0900 (KST) From: Thomas Abraham To: t.figa@samsung.com Subject: [PATCH] clk: exynos4: remove duplicate div_core2 divider clock instantiation Date: Wed, 30 Jul 2014 13:25:32 +0530 Message-id: <1406706932-10527-1-git-send-email-thomas.ab@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMLMWRmVeSWpSXmKPExsWyRsSkRnfD0hvBBuePaFn0LrjKZrHp8TVW ixnn9zFZrJ/xmsWBxWPzknqPvi2rGD0+b5ILYI7isklJzcksSy3St0vgyvhw4QJjwWe+imNP DjE2MJ7j6WLk5JAQMJHYuuQEE4QtJnHh3nq2LkYuDiGBpYwSuy/sY4EpWvD0HzOILSQwnVHi 4TFWiKIJTBLHzlwAK2IT0JG48eY3I4gtAjTp68TFYA3MAikSm/Y/ZwOxhQXCJbYdXcwKYrMI qErsOPkArJ5XwFXi+9Gd7F2MHEDLFCTmTLIBmS8hcJ9NounOO6h6AYlvkw+xQNTISmw6wAxx m6TEwRU3WCYwCi5gZFjFKJpakFxQnJReZKxXnJhbXJqXrpecn7uJERiAp/8969/BePeA9SHG ZKBxE5mlRJPzgQGcVxJvaGxmZGFqYmpsZG5pRpqwkjjv/YdJQUIC6YklqdmpqQWpRfFFpTmp xYcYmTg4pRoYFzXPl5CokNTz0uv8vaHfs5olxPPE2bRHkcJLnlSxGjyb1Cy8Sjz8zjH/Sc27 5V5oGL34fVok9taqrlMRcpNTrA9cvz7DxDHJ9Y/FW/d0zT3/GFnM99X/7S6/rNq2tsj137fC xSnThJfM3MNpf9pFcE36d7Pt23mVp0xbO+vqU0axM9svLU15qsRSnJFoqMVcVJwIAETeO+9W AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsVy+t9jQd0NS28EG9x7p2zRu+Aqm8Wmx9dY LWac38dksX7GaxYHFo/NS+o9+rasYvT4vEkugDmqgdEmIzUxJbVIITUvOT8lMy/dVsk7ON45 3tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB2ibkkJZYk4pUCggsbhYSd8O04TQEDddC5jGCF3f kCC4HiMDNJCwhjHjw4ULjAWf+SqOPTnE2MB4jqeLkZNDQsBEYsHTf8wQtpjEhXvr2UBsIYHp jBIPj7F2MXIB2ROYJI6ducACkmAT0JG48eY3I4gtAtTwdeJisGZmgRSJTfufgzULC4RLbDu6 mBXEZhFQldhx8gFYPa+Aq8T3ozvZuxg5gJYpSMyZZDOBkXsBI8MqRtHUguSC4qT0XCO94sTc 4tK8dL3k/NxNjODwfia9g3FVg8UhRgEORiUe3hn/rwcLsSaWFVfmHmKU4GBWEuE1nXMjWIg3 JbGyKrUoP76oNCe1+BCjKdDyicxSosn5wNjLK4k3NDYxNzU2tTSxMDGzVBLnPdhqHSgkkJ5Y kpqdmlqQWgTTx8TBKdXAWGladHR5l4+yzaFGp50zdlyUXfN9s8d9iX4fXv0aZy0BVW2FMPkp xbPOXhR+ujXo1U7Jx7WSJ6ZfnbJdx2F+X/DJpTbxpxXqMvzO6a66uujUu1vWM5ftWfMqe5+A xsRlgcsOnvsaVxvxml/zctrh+f/nTc/8Z+N++ccxT5vjN+6FWr+tqBb0nazEUpyRaKjFXFSc CAC6VnJYhQIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140730_005909_378207_A02CA91D X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.7 (-----) Cc: kgene.kim@samsung.com, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The 'div_core2' clock and the 'arm_clk' divider clocks are instances of the same divider clock. So remove the 'arm_clk' clock instance. Signed-off-by: Thomas Abraham --- This patch is based on for-next branch of Samsung clock tree. drivers/clk/samsung/clk-exynos4.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c index ac163d7..8617f49 100644 --- a/drivers/clk/samsung/clk-exynos4.c +++ b/drivers/clk/samsung/clk-exynos4.c @@ -719,7 +719,7 @@ static struct samsung_div_clock exynos4_div_clks[] __initdata = { DIV(0, "div_periph", "div_core2", DIV_CPU0, 12, 3), DIV(0, "div_atb", "mout_core", DIV_CPU0, 16, 3), DIV(0, "div_pclk_dbg", "div_atb", DIV_CPU0, 20, 3), - DIV(0, "div_core2", "div_core", DIV_CPU0, 28, 3), + DIV(CLK_ARM_CLK, "div_core2", "div_core", DIV_CPU0, 28, 3), DIV(0, "div_copy", "mout_hpm", DIV_CPU1, 0, 3), DIV(0, "div_hpm", "div_copy", DIV_CPU1, 4, 3), DIV(0, "div_clkout_cpu", "mout_clkout_cpu", CLKOUT_CMU_CPU, 8, 6), @@ -769,7 +769,6 @@ static struct samsung_div_clock exynos4_div_clks[] __initdata = { DIV(0, "div_spi_pre2", "div_spi2", DIV_PERIL2, 8, 8), DIV(0, "div_audio1", "mout_audio1", DIV_PERIL4, 0, 4), DIV(0, "div_audio2", "mout_audio2", DIV_PERIL4, 16, 4), - DIV(CLK_ARM_CLK, "arm_clk", "div_core2", DIV_CPU0, 28, 3), DIV(CLK_SCLK_APLL, "sclk_apll", "mout_apll", DIV_CPU0, 24, 3), DIV_F(0, "div_mipi_pre0", "div_mipi0", DIV_LCD0, 20, 4, CLK_SET_RATE_PARENT, 0), @@ -1486,7 +1485,7 @@ static void __init exynos4_clk_init(struct device_node *np, exynos4_soc == EXYNOS4210 ? "Exynos4210" : "Exynos4x12", _get_rate("sclk_apll"), _get_rate("sclk_mpll"), _get_rate("sclk_epll"), _get_rate("sclk_vpll"), - _get_rate("arm_clk")); + _get_rate("div_core2")); }