From patchwork Wed Nov 14 22:07:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 1744251 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 E782BDF264 for ; Wed, 14 Nov 2012 22:15:10 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYlBW-0006ex-Na; Wed, 14 Nov 2012 22:11:51 +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 1TYl9G-00058E-DI for linux-arm-kernel@lists.infradead.org; Wed, 14 Nov 2012 22:09:32 +0000 Received: by mail-pa0-f49.google.com with SMTP id bi5so575769pad.36 for ; Wed, 14 Nov 2012 14:09:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=ZMOmzmEeswodeStngH75pgQC1MLpH7udJtAncI+7jx0=; b=jepXt6FUYlY/uyD9J2EMb20aBmELFqC9UaRUwyptoFrSDM5CHAmrTfNCM7BdsIAIhY w5cOPMFNd6e8p+ouWBQkrmV/xFgebdNKERKmPDd4LWr+D/avAqMgFfRxf+ptiv6dcvIN l1f37F2rRo3TilATMtygD+xFq8jly/s+XJYfP7C5D3CVh9W2QZuRtH2S5nOMvUztKW+H NI9FK/IrAiFWA3w31ke4e6esiu6Pply0nbx1jfJbA5qoMN48Zc5SnNeB06HE5frLPK5G VIS0nhe/cQk9VAi6dvcspzdMUVcYjwAVwKWdgF6KGZaVq7kMOOdxE3OJyzyAwl5peoi4 mWag== Received: by 10.68.189.163 with SMTP id gj3mr1910445pbc.110.1352930970141; Wed, 14 Nov 2012 14:09:30 -0800 (PST) Received: from localhost.localdomain ([117.230.47.254]) by mx.google.com with ESMTPS id ix9sm8340673pbc.7.2012.11.14.14.09.23 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Nov 2012 14:09:29 -0800 (PST) From: Thomas Abraham To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 10/11] ARM: Exynos: use fin_pll clock as the tick clock source for mct Date: Thu, 15 Nov 2012 03:37:32 +0530 Message-Id: <1352930853-12268-11-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1352930853-12268-1-git-send-email-thomas.abraham@linaro.org> References: <1352930853-12268-1-git-send-email-thomas.abraham@linaro.org> X-Gm-Message-State: ALoCoQmeW7zHXiUAtPw8Ek4Bs6mUQQ0bGrFNMT8chT8zJevoutsmbtAxhs1LLzrgR808+9kI9pJA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121114_170931_170328_1901A781 X-CRM114-Status: GOOD ( 12.84 ) 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.220.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kgene.kim@samsung.com, mturquette@linaro.org, devicetree-discuss@lists.ozlabs.org, Thomas Abraham , sylvester.nawrocki@gmail.com, t.figa@samsung.com, mturquette@ti.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 --- arch/arm/mach-exynos/mct.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/mct.c b/arch/arm/mach-exynos/mct.c index cd061b2..47bc6b35 100644 --- a/arch/arm/mach-exynos/mct.c +++ b/arch/arm/mach-exynos/mct.c @@ -489,10 +489,12 @@ 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 = 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)