From patchwork Mon Feb 18 08:21:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 2156351 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5D5623FCFC for ; Mon, 18 Feb 2013 08:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756706Ab3BRIWd (ORCPT ); Mon, 18 Feb 2013 03:22:33 -0500 Received: from mail-da0-f50.google.com ([209.85.210.50]:59721 "EHLO mail-da0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756663Ab3BRIWc (ORCPT ); Mon, 18 Feb 2013 03:22:32 -0500 Received: by mail-da0-f50.google.com with SMTP id h15so2352483dan.37 for ; Mon, 18 Feb 2013 00:22:31 -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=rkwd0gI+W5wmRRRuTuA0di/NibymzVn4qmTNwT2asbI=; b=cZADzfw+TAv7t0PQ5QgcKzqVDLV1bBgTUOOIVqUEeqhQ4Q2Gko4fMrfljcNmkUQbT/ 7+Nfpbrv+abu2WpkzZvjtVeHVAoc4NdpqOBWbfqOZu8ODaDt37HPOad6t0FUnOu+Yv8L V6XG4pH04mCyM1gRDIS2EeFAfnVixXY8TR82B/Fde5AVWVEUbruvEI0iyH+6osow6g98 ftyFbIYJ+xGiNVeGqdWQsaHvb61pdA7m5h7HMKXxtmVXLWAyWhAx5q4tOriyHvLCyDwL unKFPk6MGh3RDfROnL4VN3kQeknDPzvAd3uw3Q2sk3l14FZRwqMvuhhz9FZDFG1vNGlO kf1w== X-Received: by 10.66.187.204 with SMTP id fu12mr33730472pac.43.1361175751907; Mon, 18 Feb 2013 00:22:31 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id hp7sm13733707pbc.8.2013.02.18.00.22.28 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Feb 2013 00:22:31 -0800 (PST) From: Thomas Abraham To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, mturquette@linaro.org, kgene.kim@samsung.com, t.figa@samsung.com, sylvester.nawrocki@gmail.com Subject: [PATCH v6 11/16] clocksource: mct: add support for mct clock setup Date: Mon, 18 Feb 2013 13:51:21 +0530 Message-Id: <1361175686-19400-12-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: ALoCoQlPmeIpwLOvmqYRGsEh4T2lWfUinPNsriK8KwiF+cSqws9g4HiE0QWD0D3zy2jQN9vLHCuJ Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Add support for mct clock lookup and setup to ensure that the mct clock is has been turned on. Cc: Kukjin Kim Signed-off-by: Thomas Abraham --- drivers/clocksource/exynos_mct.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c index 8f84c42..43e39b5 100644 --- a/drivers/clocksource/exynos_mct.c +++ b/drivers/clocksource/exynos_mct.c @@ -480,7 +480,7 @@ static struct local_timer_ops exynos4_mct_tick_ops __cpuinitdata = { static void __init exynos4_timer_resources(struct device_node *np) { - struct clk *tick_clk; + struct clk *mct_clk, *tick_clk; tick_clk = np ? of_clk_get_by_name(np, "fin_pll") : clk_get(NULL, "fin_pll"); @@ -488,6 +488,11 @@ static void __init exynos4_timer_resources(struct device_node *np) panic("%s: unable to determine tick clock rate\n", __func__); clk_rate = clk_get_rate(tick_clk); + mct_clk = np ? of_clk_get_by_name(np, "mct") : clk_get(NULL, "mct"); + if (IS_ERR(mct_clk)) + panic("%s: unable to retrieve mct clock instance\n", __func__); + clk_prepare_enable(mct_clk); + reg_base = np ? of_iomap(np, 0) : S5P_VA_SYSTIMER; if (!reg_base) panic("%s: unable to ioremap mct address space\n", __func__);