From patchwork Mon Feb 18 08:21:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 2156481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 017F6DF25A for ; Mon, 18 Feb 2013 08:27:43 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U7M2E-0006yo-Mg; Mon, 18 Feb 2013 08:25:14 +0000 Received: from mail-da0-f47.google.com ([209.85.210.47]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U7Lza-0005Q9-34 for linux-arm-kernel@lists.infradead.org; Mon, 18 Feb 2013 08:22:33 +0000 Received: by mail-da0-f47.google.com with SMTP id s35so2319264dak.20 for ; Mon, 18 Feb 2013 00:22:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=n9Buu1lUsWP6tO2xLA08819auE+aN75jVabrzuQ3+aA=; b=Sk3gz2LK6Vii4raRTMwFGPyVRyBBZZcqD+A429ta01Xk/BwA4AhYFDXJjrYHM6Awoh U2Psi5FZPlFNjy1uO5bFNW5EY8jxM2ltotjrBmT9hQkepm8Sea1dZzU8AWOgwrVRRuMC UWxbM1CT4DDA3oHe+OXRVd7sMzwbtysDADwbNQDyDdh1PV1DVVCrH38MUV7DkC0TPE/0 riJ0dyQDLM4/IT1dr4mQ/KIR2o4bFiBv38AZx5uD+DJ0hv/lQr1w0iJacwUIZDKW9O+T C6OpU7LOKQdeblvN4hFSni7AEA9LAuq3R5E3a1J6QewTvgIc6YJxnLj1pb0LGKzT/j6T iM2g== X-Received: by 10.68.35.6 with SMTP id d6mr14572225pbj.167.1361175748498; Mon, 18 Feb 2013 00:22:28 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id hp7sm13733707pbc.8.2013.02.18.00.22.25 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Feb 2013 00:22:27 -0800 (PST) From: Thomas Abraham To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v6 10/16] clocksource: mct: use fin_pll clock as the tick clock source for mct Date: Mon, 18 Feb 2013 13:51:20 +0530 Message-Id: <1361175686-19400-11-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1361175686-19400-1-git-send-email-thomas.abraham@linaro.org> References: <1361175686-19400-1-git-send-email-thomas.abraham@linaro.org> X-Gm-Message-State: ALoCoQlJlVnYQhngLirK1KmfpRokLdOFkCZrLJm3LrScD8JRbr5B1iqEYv1SiDHoinqVogrSIDVI X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130218_032230_251634_6E856A43 X-CRM114-Status: GOOD ( 11.27 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.47 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: devicetree-discuss@lists.ozlabs.org, kgene.kim@samsung.com, mturquette@linaro.org, t.figa@samsung.com, sylvester.nawrocki@gmail.com 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 With the migration of Exynos4 clocks to use common clock framework, the old styled 'xtal' clock is not used anymore. Instead, the clock 'fin_pll' is used as the tick clock for mct controller. Cc: Kukjin Kim Signed-off-by: Thomas Abraham --- drivers/clocksource/exynos_mct.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c index e067130..8f84c42 100644 --- a/drivers/clocksource/exynos_mct.c +++ b/drivers/clocksource/exynos_mct.c @@ -480,10 +480,13 @@ static struct local_timer_ops exynos4_mct_tick_ops __cpuinitdata = { static void __init exynos4_timer_resources(struct device_node *np) { - struct clk *mct_clk; - mct_clk = clk_get(NULL, "xtal"); + struct clk *tick_clk; - clk_rate = clk_get_rate(mct_clk); + tick_clk = np ? of_clk_get_by_name(np, "fin_pll") : + clk_get(NULL, "fin_pll"); + if (IS_ERR(tick_clk)) + panic("%s: unable to determine tick clock rate\n", __func__); + clk_rate = clk_get_rate(tick_clk); reg_base = np ? of_iomap(np, 0) : S5P_VA_SYSTIMER; if (!reg_base)