From patchwork Sat Apr 20 14:09:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 2468031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 56139DF2A1 for ; Sat, 20 Apr 2013 14:09:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYTr-0000o2-7r; Sat, 20 Apr 2013 14:09:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYTo-0006hH-N0; Sat, 20 Apr 2013 14:09:28 +0000 Received: from mail-la0-x231.google.com ([2a00:1450:4010:c03::231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYTk-0006gx-KS for linux-arm-kernel@lists.infradead.org; Sat, 20 Apr 2013 14:09:25 +0000 Received: by mail-la0-f49.google.com with SMTP id ei20so412079lab.36 for ; Sat, 20 Apr 2013 07:09:21 -0700 (PDT) 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 :x-gm-message-state; bh=9vyKNE3lX8SR2uI+Kfy9TicM0mjTAa3zaB9mrOp1rTk=; b=Gr5CzgrKYUcuQb+JU2ur9b9hm8I5Ce9FbiS55HgjxyhQ6rjfJadhE22TEVCukwDufb YFJrPnpz3oEiCXtIMNfvEjSlxTyBMPq/fnRvHfTTTUVLS2EaHyja2AUmg3Pr0XegdNku pI/Vr1qGqfwcGYpirlcoRFqSDoiLfP6UGdKfoWJkks+7ks2FyJP1M0mhGH6MJfJinzDd mpMR8L3QaYMzq13rYX38cp72R9Ux+CgG06EU7MaNbh9in0wM+VLNkVBj1yN/4GpoEAbC VAi3CopO7OHj+xNSGLPjjg001MR/UW+g/Rb1ZbxTIXSVgmxMiVXG982XU5a2rUtyuARB rFGg== X-Received: by 10.112.168.135 with SMTP id zw7mr9750043lbb.115.1366466961202; Sat, 20 Apr 2013 07:09:21 -0700 (PDT) Received: from localhost.localdomain (c83-249-208-67.bredband.comhem.se. [83.249.208.67]) by mx.google.com with ESMTPS id b2sm7480255lbv.4.2013.04.20.07.09.19 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 20 Apr 2013 07:09:20 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/4] clocksource: nomadik-mtu: fix up clocksource/timer Date: Sat, 20 Apr 2013 16:09:17 +0200 Message-Id: <1366466957-16053-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Gm-Message-State: ALoCoQktr3wNhtH0gPCkDKpiv7MmGCEXwHPNbNJuo3xrR5DV2qxrIr/y72SFpZ8QNlS/PLqvqnGl X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130420_100924_854099_F8C74910 X-CRM114-Status: GOOD ( 12.20 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Linus Walleij X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 The Nomadik clocksource driver has had a bad define making it impossible to use it for sched_clock() for a while. Fix this and also enable it for the Nomadik. Signed-off-by: Linus Walleij --- arch/arm/mach-nomadik/Kconfig | 1 + drivers/clocksource/nomadik-mtu.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig index 954f0e3..8c1ccd4 100644 --- a/arch/arm/mach-nomadik/Kconfig +++ b/arch/arm/mach-nomadik/Kconfig @@ -5,6 +5,7 @@ config ARCH_NOMADIK select ARM_AMBA select ARM_VIC select CLKSRC_NOMADIK_MTU + select CLKSRC_NOMADIK_MTU_SCHED_CLOCK select COMMON_CLK select CPU_ARM926T select GENERIC_CLOCKEVENTS diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index 071f6ea..e405531 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -67,7 +67,7 @@ static u32 clk_prescale; static u32 nmdk_cycle; /* write-once */ static struct delay_timer mtu_delay_timer; -#ifdef CONFIG_NOMADIK_MTU_SCHED_CLOCK +#ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK /* * Override the global weak sched_clock symbol with this * local implementation which uses the clocksource to get some @@ -233,7 +233,7 @@ void __init nmdk_timer_init(void __iomem *base, int irq) pr_err("timer: failed to initialize clock source %s\n", "mtu_0"); -#ifdef CONFIG_NOMADIK_MTU_SCHED_CLOCK +#ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK setup_sched_clock(nomadik_read_sched_clock, 32, rate); #endif